[nifi] branch master updated: NIFI-6442: ExecuteSQL/ExecuteSQLRecord convert to Avro date type incorrectly when set 'Use Avro Logical Types' to true

2019-07-18 Thread ijokarumawak 
This is an automated email from the ASF dual-hosted git repository.

ijokarumawak pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/master by this push:
 new 3bfef33  NIFI-6442: ExecuteSQL/ExecuteSQLRecord convert to Avro date 
type incorrectly when set 'Use Avro Logical Types' to true
3bfef33 is described below

commit 3bfef3356e158d8691008e3675bb7a5cc65064fb
Author: archon 
AuthorDate: Wed Jul 17 10:12:24 2019 +0800

NIFI-6442: ExecuteSQL/ExecuteSQLRecord convert to Avro date type 
incorrectly when set 'Use Avro Logical Types' to true

This closes #3584.

Signed-off-by: Koji Kawamura 
---
 .../nifi/serialization/record/util/DataTypeUtils.java   | 16 
 .../main/java/org/apache/nifi/avro/AvroTypeUtil.java|  8 +++-
 .../java/org/apache/nifi/avro/TestAvroTypeUtil.java | 17 +
 3 files changed, 28 insertions(+), 13 deletions(-)

diff --git 
a/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/util/DataTypeUtils.java
 
b/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/util/DataTypeUtils.java
index bab455a..0686dcf 100644
--- 
a/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/util/DataTypeUtils.java
+++ 
b/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/util/DataTypeUtils.java
@@ -892,15 +892,15 @@ public class DataTypeUtils {
 return null;
 }
 
+if (value instanceof Date) {
+return (Date) value;
+}
+
 if (value instanceof java.util.Date) {
 java.util.Date _temp = (java.util.Date)value;
 return new Date(_temp.getTime());
 }
 
-if (value instanceof Date) {
-return (Date) value;
-}
-
 if (value instanceof Number) {
 final long longValue = ((Number) value).longValue();
 return new Date(longValue);
@@ -1038,14 +1038,14 @@ public class DataTypeUtils {
 return null;
 }
 
-if (value instanceof java.util.Date) {
-return new Timestamp(((java.util.Date)value).getTime());
-}
-
 if (value instanceof Timestamp) {
 return (Timestamp) value;
 }
 
+if (value instanceof java.util.Date) {
+return new Timestamp(((java.util.Date)value).getTime());
+}
+
 if (value instanceof Number) {
 final long longValue = ((Number) value).longValue();
 return new Timestamp(longValue);
diff --git 
a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-avro-record-utils/src/main/java/org/apache/nifi/avro/AvroTypeUtil.java
 
b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-avro-record-utils/src/main/java/org/apache/nifi/avro/AvroTypeUtil.java
index 097844a..a60c993 100644
--- 
a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-avro-record-utils/src/main/java/org/apache/nifi/avro/AvroTypeUtil.java
+++ 
b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-avro-record-utils/src/main/java/org/apache/nifi/avro/AvroTypeUtil.java
@@ -60,6 +60,7 @@ import java.sql.Blob;
 import java.sql.Time;
 import java.sql.Timestamp;
 import java.time.Duration;
+import java.time.LocalDate;
 import java.time.temporal.ChronoUnit;
 import java.util.AbstractMap;
 import java.util.ArrayList;
@@ -652,9 +653,8 @@ public class AvroTypeUtil {
 
 if (LOGICAL_TYPE_DATE.equals(logicalType.getName())) {
 final String format = 
AvroTypeUtil.determineDataType(fieldSchema).getFormat();
-final Date date = DataTypeUtils.toDate(rawValue, () -> 
DataTypeUtils.getDateFormat(format), fieldName);
-final Duration duration = Duration.between(new 
Date(0L).toInstant(), new Date(date.getTime()).toInstant());
-final long days = duration.toDays();
+final java.sql.Date date = DataTypeUtils.toDate(rawValue, 
() -> DataTypeUtils.getDateFormat(format), fieldName);
+final long days = 
ChronoUnit.DAYS.between(LocalDate.ofEpochDay(0), date.toLocalDate());
 return (int) days;
 } else if 
(LOGICAL_TYPE_TIME_MILLIS.equals(logicalType.getName())) {
 final String format = 
AvroTypeUtil.determineDataType(fieldSchema).getFormat();
@@ -679,8 +679,6 @@ public class AvroTypeUtil {
 final Duration duration = 
Duration.between(date.toInstant().truncatedTo(ChronoUnit.DAYS), 
date.toInstant());
 return duration.toMillis() * 1000L;
 } else if 
(LOGICAL_TYPE_TIMESTAMP_MILLIS.equals(logicalType.getName())) {
-final String format = 
AvroTypeUtil.determineDataType(fieldSchema).getFormat();
-Timestamp t = DataTypeUtils.toTimestamp(rawValue, () -> 
DataTypeU

[nifi] branch master updated: NIFI-6334 - fix custom validate error in PutBigqueryBatch

2019-07-18 Thread ijokarumawak 
This is an automated email from the ASF dual-hosted git repository.

ijokarumawak pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/master by this push:
 new 630c651  NIFI-6334 - fix custom validate error in PutBigqueryBatch
630c651 is described below

commit 630c651226228ab2ed990d679b7588b93303682e
Author: Pierre Villard 
AuthorDate: Thu Jul 18 15:48:39 2019 +0200

NIFI-6334 - fix custom validate error in PutBigqueryBatch

This closes #3589.

Signed-off-by: Koji Kawamura 
---
 .../processors/gcp/bigquery/AbstractBigQueryProcessor.java|  3 ++-
 .../nifi/processors/gcp/bigquery/PutBigQueryBatchTest.java| 11 ++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/bigquery/AbstractBigQueryProcessor.java
 
b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/bigquery/AbstractBigQueryProcessor.java
index c249e7e..3751060 100644
--- 
a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/bigquery/AbstractBigQueryProcessor.java
+++ 
b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/bigquery/AbstractBigQueryProcessor.java
@@ -35,6 +35,7 @@ import 
org.apache.nifi.processors.gcp.ProxyAwareTransportFactory;
 import org.apache.nifi.proxy.ProxyConfiguration;
 import org.apache.nifi.util.StringUtils;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -135,7 +136,7 @@ public abstract class AbstractBigQueryProcessor extends 
AbstractGCPProcessor 
customValidate(ValidationContext validationContext) {
-final Collection results = 
super.customValidate(validationContext);
+final Collection results = new 
ArrayList(super.customValidate(validationContext));
 ProxyConfiguration.validateProxySpec(validationContext, results, 
ProxyAwareTransportFactory.PROXY_SPECS);
 
 final boolean projectId = 
validationContext.getProperty(PROJECT_ID).isSet();
diff --git 
a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/bigquery/PutBigQueryBatchTest.java
 
b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/bigquery/PutBigQueryBatchTest.java
index 7ec5aa9..c4063b3 100644
--- 
a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/bigquery/PutBigQueryBatchTest.java
+++ 
b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/test/java/org/apache/nifi/processors/gcp/bigquery/PutBigQueryBatchTest.java
@@ -125,7 +125,6 @@ public class PutBigQueryBatchTest extends AbstractBQTest {
 runner.assertAllFlowFilesTransferred(PutBigQueryBatch.REL_SUCCESS);
 }
 
-
 @Test
 public void testFailedLoad() throws Exception {
 when(table.exists()).thenReturn(Boolean.TRUE);
@@ -150,4 +149,14 @@ public class PutBigQueryBatchTest extends AbstractBQTest {
 
 runner.assertAllFlowFilesTransferred(PutBigQueryBatch.REL_FAILURE);
 }
+
+@Test
+public void testMandatoryProjectId() throws Exception {
+final TestRunner runner = buildNewRunner(getProcessor());
+addRequiredPropertiesToRunner(runner);
+runner.assertValid();
+
+runner.removeProperty(PutBigQueryBatch.PROJECT_ID);
+runner.assertNotValid();
+}
 }
\ No newline at end of file

[nifi] branch master updated: NIFI-6439 - Revert Spring Framework HTTPS XSD (#3590)

2019-07-18 Thread alopresto 
This is an automated email from the ASF dual-hosted git repository.

alopresto pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/master by this push:
 new 2b0b96e  NIFI-6439 - Revert Spring Framework HTTPS XSD (#3590)
2b0b96e is described below

commit 2b0b96e59ed8f73c2756a0515a38bc7c6aee6552
Author: Peter Wicks 
AuthorDate: Thu Jul 18 12:08:07 2019 -0600

NIFI-6439 - Revert Spring Framework HTTPS XSD (#3590)
---
 .../src/main/resources/nifi-administration-context.xml  | 2 +-
 .../nifi-authorizer/src/main/resources/nifi-authorizer-context.xml  | 2 +-
 .../src/main/resources/nifi-cluster-protocol-context.xml| 2 +-
 .../src/main/resources/nifi-cluster-manager-context.xml | 2 +-
 .../nifi-framework-core/src/main/resources/nifi-context.xml | 2 +-
 .../nifi-web/nifi-web-api/src/main/resources/nifi-web-api-context.xml   | 2 +-
 .../nifi-web-security/src/main/resources/nifi-web-security-context.xml  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/resources/nifi-administration-context.xml
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/resources/nifi-administration-context.xml
index f0977a1..e717686 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/resources/nifi-administration-context.xml
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/src/main/resources/nifi-administration-context.xml
@@ -16,7 +16,7 @@
 http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-   xsi:schemaLocation="http://www.springframework.org/schema/beans 
https://www.springframework.org/schema/beans/spring-beans-3.1.xsd";>
+   xsi:schemaLocation="http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-3.1.xsd";>
 
 
 
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-authorizer/src/main/resources/nifi-authorizer-context.xml
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-authorizer/src/main/resources/nifi-authorizer-context.xml
index 977639e..6c484fc 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-authorizer/src/main/resources/nifi-authorizer-context.xml
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-authorizer/src/main/resources/nifi-authorizer-context.xml
@@ -16,7 +16,7 @@
 http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-   xsi:schemaLocation="http://www.springframework.org/schema/beans 
https://www.springframework.org/schema/beans/spring-beans-3.1.xsd";>
+   xsi:schemaLocation="http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-3.1.xsd";>
 
 
 
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/resources/nifi-cluster-protocol-context.xml
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/resources/nifi-cluster-protocol-context.xml
index 1563c09..e69a06e 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/resources/nifi-cluster-protocol-context.xml
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/src/main/resources/nifi-cluster-protocol-context.xml
@@ -18,7 +18,7 @@
xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:util="http://www.springframework.org/schema/util";
-   xsi:schemaLocation="http://www.springframework.org/schema/beans 
https://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+   xsi:schemaLocation="http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans.xsd
 http://www.springframework.org/schema/util 
http://www.springframework.org/schema/util/spring-util-3.1.xsd";>
 
 
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/resources/nifi-cluster-manager-context.xml
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/resources/nifi-cluster-manager-context.xml
index 02cdcfc..c1a7665 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/resources/nifi-cluster-manager-context.xml
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/resources/nifi-cluster-manager-context.xml
@@ -20,7 +20,7 @@
xmlns:util="http://www.springframework.org/schema/util";
xmlns:context="http://www.springfr

[nifi-fds] branch master updated: NIFI-6451 - FDS - Fix issue preventing full build without first running npm install from the root.

2019-07-18 Thread mcgilman 
This is an automated email from the ASF dual-hosted git repository.

mcgilman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-fds.git


The following commit(s) were added to refs/heads/master by this push:
 new 5ae06ff  NIFI-6451 - FDS - Fix issue preventing full build without 
first running npm install from the root.
5ae06ff is described below

commit 5ae06ffb1466c41465883749c5e4eac5afe9a175
Author: Rob Fellows 
AuthorDate: Thu Jul 18 13:00:32 2019 -0400

NIFI-6451 - FDS - Fix issue preventing full build without first running npm 
install from the root.

This closes #43
---
 .eslintrc.js| 1 +
 README.md   | 4 +++-
 scripts/clean-install   | 3 +++
 scripts/clean-install-skipTests | 1 +
 scripts/dev-install | 1 +
 scripts/dev-install-skipTests   | 1 +
 6 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 10adbfd..3639b7d 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -16,6 +16,7 @@
  */
 
 module.exports = {
+"root": true,
 "extends": "eslint-config-airbnb",
 "env": {
 "browser": true,
diff --git a/README.md b/README.md
index e730b89..faab335 100644
--- a/README.md
+++ b/README.md
@@ -96,6 +96,8 @@ npm run watch
 ```
 
  Building
+_NOTE: Building depends on `bash` scripts found in the `scripts` folder. 
Therefore, building on Windows is not supported at this time._
+
 Full builds are also available using **npm** from the root directory via:
 
 ```bash
@@ -108,7 +110,7 @@ or to build without running unit tests run:
 npm run clean:install:skipTests
 ```
 
-NOTE: Full builds for this project assume a 2 stage build but it only 
completes the first stage for you. In the first stage all of the assets for the 
project are copied into the `target/frontend-working-directory`, tested, and 
bundled/minified/obfuscated. It is up to the consumer of this project to 
integrate the second sta include the produced index.html and optimized assets 
files into any deployable archive of their choosing.
+NOTE: Full builds for this project assume a 2 stage build but it only 
completes the first stage for you. In the first stage all of the assets for the 
project are copied into the `target/frontend-working-directory`, tested, and 
bundled/minified/obfuscated. It is up to the consumer of this project to 
integrate the second stage to include the produced index.html and optimized 
assets files into any deployable archive of their choosing.
 
  Running full builds locally
 Once built you can start the application from the 
`target/frontend-working-directory` directory via:
diff --git a/scripts/clean-install b/scripts/clean-install
old mode 100644
new mode 100755
index cb86be2..6643c7e
--- a/scripts/clean-install
+++ b/scripts/clean-install
@@ -19,6 +19,7 @@ set -e
 rm -rf ./target
 mkdir target
 mkdir ./target/frontend-working-directory
+
 cp -R ./webapp/ ./target/frontend-working-directory/webapp
 cp -R ./platform/ ./target/frontend-working-directory/platform
 cp package.json ./target/frontend-working-directory/package.json
@@ -32,7 +33,9 @@ cp ./karma-test-shim.js 
./target/frontend-working-directory/karma-test-shim.js
 cp Gruntfile.js ./target/frontend-working-directory/Gruntfile.js
 cp ./webapp/gh-pages.* ./target/frontend-working-directory/
 cp angular-url-loader.js ./target/frontend-working-directory/
+cp .eslint* ./target/frontend-working-directory/
 cd ./target/frontend-working-directory
+
 npm install
 
 # test
diff --git a/scripts/clean-install-skipTests b/scripts/clean-install-skipTests
index dec8b59..ac3fe7e 100644
--- a/scripts/clean-install-skipTests
+++ b/scripts/clean-install-skipTests
@@ -32,6 +32,7 @@ cp ./karma-test-shim.js 
./target/frontend-working-directory/karma-test-shim.js
 cp Gruntfile.js ./target/frontend-working-directory/Gruntfile.js
 cp ./webapp/gh-pages.* ./target/frontend-working-directory/
 cp angular-url-loader.js ./target/frontend-working-directory/
+cp .eslint* ./target/frontend-working-directory/
 cd ./target/frontend-working-directory
 npm install
 
diff --git a/scripts/dev-install b/scripts/dev-install
index 6c3f318..b297517 100644
--- a/scripts/dev-install
+++ b/scripts/dev-install
@@ -29,6 +29,7 @@ cp ./karma-test-shim.js 
./target/frontend-working-directory/karma-test-shim.js
 cp Gruntfile.js ./target/frontend-working-directory/Gruntfile.js
 cp ./webapp/gh-pages.* ./target/frontend-working-directory/
 cp angular-url-loader.js ./target/frontend-working-directory/
+cp .eslint* ./target/frontend-working-directory/
 cd ./target/frontend-working-directory
 npm install
 
diff --git a/scripts/dev-install-skipTests b/scripts/dev-install-skipTests
index 307e11d..a246b7d 100644
--- a/scripts/dev-install-skipTests
+++ b/scripts/dev-install-skipTests
@@ -29,6 +29,7 @@ cp ./karma-test-shim.js 
./target/frontend-working-directory/karma-test-shim.js
 cp Gruntfile.js ./target/frontend-working-directory/Gruntfile.js
 cp ./

[nifi-fds] branch master updated: [NIFI-6452] require npm 5.6.0

2019-07-18 Thread mcgilman 
This is an automated email from the ASF dual-hosted git repository.

mcgilman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-fds.git


The following commit(s) were added to refs/heads/master by this push:
 new 750b5e8  [NIFI-6452] require npm 5.6.0
750b5e8 is described below

commit 750b5e8050aa344ac8c194681a6a80525ae9ccb2
Author: Scott Aslan 
AuthorDate: Thu Jul 18 10:53:48 2019 -0400

[NIFI-6452] require npm 5.6.0

This closes #41
---
 README.md| 3 +++
 package.json | 4 
 2 files changed, 7 insertions(+)

diff --git a/README.md b/README.md
index a8e277d..e730b89 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,9 @@ The demo application serves 2 main purposes
 * As a way for code reviewers to validate code changes as well as each 
`@nifi-fds/core` release 
 * Provides a working example of how an Angular application should leverage the 
`@nifi-fds/core`.
 
+## Requirements
+This project requires npm version 5.6.0.
+
 ## Quick Start
 For developers not interested in building the FDS NgModule you can use **npm** 
to install the distribution files.
 
diff --git a/package.json b/package.json
index c17cda8..054e54e 100644
--- a/package.json
+++ b/package.json
@@ -140,5 +140,9 @@
 "webpack-dev-server": "3.7.2",
 "webpack-fix-style-only-entries": "0.3.0",
 "webpack-merge": "4.2.1"
+},
+"engines": {
+"node": "=8.10.0",
+"npm": "=5.6.0"
 }
 }

[nifi-fds] branch master updated: [NIFI-6366] update covalent NgModule imports and add stepper

2019-07-18 Thread mcgilman 
This is an automated email from the ASF dual-hosted git repository.

mcgilman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-fds.git


The following commit(s) were added to refs/heads/master by this push:
 new a9ad73e  [NIFI-6366] update covalent NgModule imports and add stepper
a9ad73e is described below

commit a9ad73eef413979bf4e5d6464c8dcc83a935d89b
Author: Scott Aslan 
AuthorDate: Wed Jul 17 15:33:01 2019 -0400

[NIFI-6366] update covalent NgModule imports and add stepper

This closes #31
---
 platform/core/common/styles/_stepper.scss  | 13 +
 platform/core/flow-design-system.module.js |  7 ++-
 platform/core/theming/_all-theme.scss  | 31 +--
 webapp/components/flow-design-system/fds-demo.html | 62 ++
 webapp/components/flow-design-system/fds-demo.js   |  2 +-
 webapp/services/fds.service.js |  2 +-
 webpack.common.js  |  6 ---
 7 files changed, 98 insertions(+), 25 deletions(-)

diff --git a/platform/core/common/styles/_stepper.scss 
b/platform/core/common/styles/_stepper.scss
index d64552c..939d4fa 100644
--- a/platform/core/common/styles/_stepper.scss
+++ b/platform/core/common/styles/_stepper.scss
@@ -18,3 +18,16 @@
 .td-step-header span {
   display: none;
 }
+
+@mixin fds-stepper-theme($theme) {
+$primaryColor: map-get(map-get($theme, primary), 500);
+$primaryColorHover: map-get(map-get($theme, primary), 100);
+$accentColor: map-get(map-get($theme, accent), 500);
+$accentColorHover: map-get(map-get($theme, accent), 100);
+
+body[fds] {
+.td-steps .td-circle.mat-active {
+background-color: $accentColor;
+}
+}
+}
diff --git a/platform/core/flow-design-system.module.js 
b/platform/core/flow-design-system.module.js
index 084afb8..4881f53 100644
--- a/platform/core/flow-design-system.module.js
+++ b/platform/core/flow-design-system.module.js
@@ -56,11 +56,12 @@ import { BrowserAnimationsModule } from 
'@angular/platform-browser/animations';
 import {
 CovalentCommonModule,
 CovalentChipsModule,
-CovalentDataTableModule,
 CovalentDialogsModule,
 CovalentExpansionPanelModule,
 CovalentPagingModule
-} from '@covalent/core/bundles/covalent-core.umd.min.js';
+} from '@covalent/core';
+import { CovalentStepsModule } from '@covalent/core/steps';
+import { CovalentDataTableModule } from '@covalent/core/data-table';
 import { FdsDialogsModule } from './dialogs/fds-dialogs.module';
 import { FdsSnackBarsModule } from './snackbars/fds-snackbars.module';
 
@@ -127,6 +128,7 @@ FlowDesignSystemModule.annotations = [
 MatTableModule,
 CovalentCommonModule,
 CovalentChipsModule,
+CovalentStepsModule,
 CovalentDataTableModule,
 CovalentDialogsModule,
 CovalentExpansionPanelModule,
@@ -171,6 +173,7 @@ FlowDesignSystemModule.annotations = [
 MatTableModule,
 CovalentCommonModule,
 CovalentChipsModule,
+CovalentStepsModule,
 CovalentDataTableModule,
 CovalentDialogsModule,
 CovalentExpansionPanelModule,
diff --git a/platform/core/theming/_all-theme.scss 
b/platform/core/theming/_all-theme.scss
index 2504953..4083939 100644
--- a/platform/core/theming/_all-theme.scss
+++ b/platform/core/theming/_all-theme.scss
@@ -14,7 +14,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-
 @import '~@angular/material/theming';
 @import '~@covalent/core/theming/all-theme';
 @import '../common/styles/buttons';
@@ -23,24 +22,26 @@
 @import '../common/styles/inputs';
 @import '../common/styles/checkboxes';
 @import '../common/styles/tables';
+@import '../common/styles/stepper';
 @import '../common/styles/links';
 @import '../common/styles/buttonToggles';
 @import '../common/styles/radios';
 
 // Create a theme.
 @mixin fds-theme($theme) {
-  // Include theme styles for core and each component used in your app.
-  // Alternatively, you can import and @include the theme mixins for each 
component
-  // that you are using.
-  @include angular-material-theme($theme);
-  @include covalent-theme($theme);
-  @include fds-buttons-theme($theme);
-  @include fds-expansion-panels-theme($theme);
-  @include fds-menus-theme($theme);
-  @include fds-input-element-theme($theme);
-  @include fds-checkboxes-theme($theme);
-  @include fds-tables-theme($theme);
-  @include fds-links-theme($theme);
-  @include fds-button-toggles-theme($theme);
-  @include fds-radios-theme($theme);
+// Include theme styles for core and each component used in your app.
+// Alternatively, you can import and @include the theme mixins for each 
component
+// that you are using.
+@include angular-material-theme($theme);
+@include covalent-theme($theme);
+@include fds-buttons-theme($theme);

[nifi-fds] branch master updated: NIFI-6446 - FDS - Update ButtonToggles component to use theme colors.

2019-07-18 Thread scottyaslan 
This is an automated email from the ASF dual-hosted git repository.

scottyaslan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-fds.git


The following commit(s) were added to refs/heads/master by this push:
 new 9a48355  NIFI-6446 - FDS - Update ButtonToggles component to use theme 
colors.
9a48355 is described below

commit 9a483550767853048e64c71f7238ddd27c9ab8c0
Author: Rob Fellows 
AuthorDate: Thu Jul 18 10:06:27 2019 -0400

NIFI-6446 - FDS - Update ButtonToggles component to use theme colors.

This closes #39

Signed-off-by: Scott Aslan 
---
 platform/core/common/styles/_buttonToggles.scss | 185 
 platform/core/theming/_all-theme.scss   |   2 +
 2 files changed, 98 insertions(+), 89 deletions(-)

diff --git a/platform/core/common/styles/_buttonToggles.scss 
b/platform/core/common/styles/_buttonToggles.scss
index 2c5216b..3c198c5 100644
--- a/platform/core/common/styles/_buttonToggles.scss
+++ b/platform/core/common/styles/_buttonToggles.scss
@@ -15,93 +15,100 @@
  * limitations under the License.
  */
 
-body[fds] .expansion-panel-filter-toggle-group {
-  box-shadow: none !important;
-  border: none;
-  border-radius: 0;
-}
-
-body[fds] .expansion-panel-filter-toggle-group .mat-button-toggle {
-  height: 75px;
-  width: 125px;
-  border: 1px solid $grey4;
-}
-
-body[fds] .expansion-panel-filter-toggle-group 
.mat-button-toggle-label-content {
-  height: 100%;
-  width: 100%;
-  padding: 0;
-  line-height: 63px;
-  text-align: center;
-}
-
-body[fds] .expansion-panel-filter-toggle-group .mat-button-toggle-checked {
-  background-color: $blue-grey1;
-  color: white;
-}
-
-body[fds] .expansion-panel-filter-toggle-group .mat-display-1 {
-  color: $blue-grey1;
-  margin: 0;
-}
-
-body[fds] .expansion-panel-filter-toggle-group .mat-button-toggle-checked 
.mat-display-1 {
-  color: white;
-}
-
-body[fds] .expansion-panel-filter-toggle-group div {
-  line-height: normal;
-}
-
-body[fds] .mat-button-toggle-checked .mat-button-toggle-focus-overlay {
-border-bottom: none;
-}
-
-body[fds] .tab-toggle-group {
-  box-shadow: none !important;
-  border: none;
-  border-radius: 0;
-}
-
-body[fds] .tab-toggle-group .mat-button-toggle-label-content {
-  border-bottom: 2px solid $grey5;
-}
-
-body[fds] .tab-toggle-group .mat-button-toggle-checked {
-  background: transparent;
-}
-
-body[fds] .on-off-toggle-group .mat-button-toggle-label-content {
-  height: 100%;
-  width: 100%;
-  padding: 0;
-  line-height: 20px;
-  text-align: center;
-}
-
-body[fds] .tab-toggle-group .mat-button-toggle-checked 
.mat-button-toggle-label-content {
-  border-bottom: 2px solid $blue-grey1;
-  background: transparent;
-}
-
-body[fds] .on-off-toggle-group {
-  box-shadow: none !important;
-}
-
-body[fds] .on-off-toggle-group .mat-button-toggle {
-  height: 20px;
-  width: 35px;
-  border: 1px solid $grey4;
-}
-
-body[fds] .on-off-toggle-group .mat-button-toggle-checked {
-  background-color: $blue-grey1;
-  color: white;
-  border: 1px solid $blue-grey1;
-}
-
-body[fds] .off-toggle.mat-button-toggle-checked {
-  background-color: $grey4;
-  color: $grey1;
-  border: 1px solid $grey4;
+@mixin fds-button-toggles-theme($theme) {
+$primaryColor: map-get(map-get($theme, primary), 500);
+$primaryColorHover: map-get(map-get($theme, primary), 100);
+$accentColor: map-get(map-get($theme, accent), 500);
+$accentColorHover: map-get(map-get($theme, accent), 100);
+
+body[fds] .expansion-panel-filter-toggle-group {
+box-shadow: none !important;
+border: none;
+border-radius: 0;
+}
+
+body[fds] .expansion-panel-filter-toggle-group .mat-button-toggle {
+height: 75px;
+width: 125px;
+border: 1px solid $grey4;
+}
+
+body[fds] .expansion-panel-filter-toggle-group 
.mat-button-toggle-label-content {
+height: 100%;
+width: 100%;
+padding: 0;
+line-height: 63px;
+text-align: center;
+}
+
+body[fds] .expansion-panel-filter-toggle-group .mat-button-toggle-checked {
+background-color: $accentColor;
+color: white;
+}
+
+body[fds] .expansion-panel-filter-toggle-group .mat-display-1 {
+color: $accentColor;
+margin: 0;
+}
+
+body[fds] .expansion-panel-filter-toggle-group .mat-button-toggle-checked 
.mat-display-1 {
+color: white;
+}
+
+body[fds] .expansion-panel-filter-toggle-group div {
+line-height: normal;
+}
+
+body[fds] .mat-button-toggle-checked .mat-button-toggle-focus-overlay {
+border-bottom: none;
+}
+
+body[fds] .tab-toggle-group {
+box-shadow: none !important;
+border: none;
+border-radius: 0;
+}
+
+body[fds] .tab-toggle-group .mat-button-toggle-label-content {
+border-bottom: 2px solid $grey5;
+}
+
+body[fds] .tab-toggle-group .mat-button-toggle-checked {
+background: transp

[nifi-fds] branch master updated: NIFI-6450 - Update Table component to use theme-defined color for highlight row

2019-07-18 Thread scottyaslan 
This is an automated email from the ASF dual-hosted git repository.

scottyaslan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-fds.git


The following commit(s) were added to refs/heads/master by this push:
 new 355954d  NIFI-6450 - Update Table component to use theme-defined color 
for highlight row
355954d is described below

commit 355954d8546aac7d5eb5580b47ed32d5cec2b7d5
Author: Rob Fellows 
AuthorDate: Thu Jul 18 10:21:36 2019 -0400

NIFI-6450 - Update Table component to use theme-defined color for highlight 
row

This closes #40

Signed-off-by: Scott Aslan 
---
 platform/core/common/styles/_tables.scss | 189 +++
 1 file changed, 94 insertions(+), 95 deletions(-)

diff --git a/platform/core/common/styles/_tables.scss 
b/platform/core/common/styles/_tables.scss
index 66ef764..77dc5f1 100644
--- a/platform/core/common/styles/_tables.scss
+++ b/platform/core/common/styles/_tables.scss
@@ -16,113 +16,112 @@
  */
 
 /* Tables */
+@mixin fds-tables-theme($theme) {
+$primaryColor: map-get(map-get($theme, primary), 500);
+$primaryColorHover: map-get(map-get($theme, primary), 100);
+$accentColor: map-get(map-get($theme, accent), 500);
+$accentColorHover: map-get(map-get($theme, accent), 100);
+
+body[fds] {
+.td-data-table-cell .mat-icon-button {
+color: $accentColor;
+}
+
+.td-data-table-column .fa-caret-up,
+.td-data-table-column .fa-caret-down {
+color: $accentColor;
+font-size: 12px;
+margin-bottom: 2px;
+}
+}
 
-body[fds] .td-data-table-cell {
-  font-size: 13px;
-  color: $grey2;
-  padding: 0 28px;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  height: 100%;
-  line-height: 30px;
-}
-
-body[fds] .td-data-table-column {
-  color: $grey3;
-  font-weight: normal;
-  font-size: 12px;
-  height: 34px;
-  line-height: 34px;
-  padding: 0 28px;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  overflow: hidden;
-}
-
-body[fds] .td-data-table-row {
-  height: 34px;
-  border-top: 1px solid #fff;
-  border-left: 1px solid #fff;
-  border-right: 1px solid #fff;
-  border-bottom: 1px solid $grey5;
-}
+body[fds] .td-data-table-cell {
+font-size: 13px;
+color: $grey2;
+padding: 0 28px;
+white-space: nowrap;
+overflow: hidden;
+text-overflow: ellipsis;
+height: 100%;
+line-height: 30px;
+}
 
-body[fds] .td-data-table-row.selected {
-  background-color: $grey5;
-  border: 1px solid $grey5;
-}
+body[fds] .td-data-table-column {
+color: $grey3;
+font-weight: normal;
+font-size: 12px;
+height: 34px;
+line-height: 34px;
+padding: 0 28px;
+white-space: nowrap;
+text-overflow: ellipsis;
+overflow: hidden;
+}
 
-body[fds] .td-data-table-row:hover {
-  background-color: $blue4;
-  border: 1px solid $blue3;
-}
+body[fds] .td-data-table-row {
+height: 34px;
+border-top: 1px solid #fff;
+border-left: 1px solid #fff;
+border-right: 1px solid #fff;
+border-bottom: 1px solid $grey5;
+}
 
-body[fds] .td-data-table-cell .mat-button,
-body[fds] .td-data-table-cell .mat-icon-button,
-body[fds] .td-data-table-cell .mat-raised-button {
-  height: 24px;
-  width: 24px;
-  line-height: 0;
-
-  &:disabled {
-color: $grey13;
-cursor: not-allowed;
-  }
-}
+body[fds] .td-data-table-row.selected {
+background-color: $grey5;
+border: 1px solid $grey5;
+}
 
-body[fds] .td-data-table-cell .mat-icon-button.badge {
-  border-top-left-radius: 0;
-  border-top-right-radius: 0;
-}
+body[fds] .td-data-table-row:hover {
+background-color: $accentColorHover;
+border: 1px solid $accentColor;
+}
 
-body[fds] .td-data-table-cell .mat-icon-button.badge[disabled] {
-  opacity: 0.3;
-}
+body[fds] .td-data-table-cell .mat-button,
+body[fds] .td-data-table-cell .mat-icon-button,
+body[fds] .td-data-table-cell .mat-raised-button {
+height: 24px;
+width: 24px;
+line-height: 0;
+
+&:disabled {
+color: $grey13;
+cursor: not-allowed;
+}
+}
 
-body[fds] td-paging-bar {
-  color: $grey3;
-}
+body[fds] .td-data-table-cell .mat-icon-button.badge {
+border-top-left-radius: 0;
+border-top-right-radius: 0;
+}
 
-body[fds] td-paging-bar mat-select .mat-select-value,
-body[fds] td-paging-bar mat-select .mat-select-arrow {
-  color: $blue-grey1;
-}
+body[fds] .td-data-table-cell .mat-icon-button.badge[disabled] {
+opacity: 0.3;
+}
 
-body[fds] .table-title {
-  font-size: 20px;
-  color: $grey1;
-  min-width: 250px;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  max-width: 50%;
-  margin-right: 10px;
-}
+body[fds] td-paging-bar {
+co

[nifi-fds] branch master updated: NIFI-6445 - FDS - Update Radio button component to be themeable

2019-07-18 Thread scottyaslan 
This is an automated email from the ASF dual-hosted git repository.

scottyaslan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-fds.git


The following commit(s) were added to refs/heads/master by this push:
 new 2402568  NIFI-6445 - FDS - Update Radio button component to be 
themeable
2402568 is described below

commit 24025684cc407d48e7655ea3ebafd9790dd256a9
Author: Rob Fellows 
AuthorDate: Thu Jul 18 08:47:16 2019 -0400

NIFI-6445 - FDS - Update Radio button component to be themeable

This closes #38

Signed-off-by: Scott Aslan 
---
 platform/core/common/styles/_radios.scss | 79 +---
 platform/core/theming/_all-theme.scss|  2 +
 2 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/platform/core/common/styles/_radios.scss 
b/platform/core/common/styles/_radios.scss
index 8ccc309..f100b76 100644
--- a/platform/core/common/styles/_radios.scss
+++ b/platform/core/common/styles/_radios.scss
@@ -17,40 +17,47 @@
 
 /* Radios */
 
-body[fds] .mat-radio-container {
-  height: 12px;
-  width: 12px;
-}
-
-body[fds] .mat-radio-outer-circle {
-  height: 12px;
-  width: 12px;
-  background-color: #fff;
-  border: 1px solid $grey7;
-}
-
-body[fds] .mat-radio-outer-circle:hover {
-  background-color: $blue-grey1;
-  border-color: $blue-grey1;
-}
-
-body[fds] .mat-radio-checked .mat-radio-outer-circle {
-  border: 1px solid $blue-grey1;
-  background-color: $blue-grey1;
-}
-
-body[fds] .mat-radio-button.mat-accent.mat-radio-checked 
.mat-radio-outer-circle {
-  border-color: $blue-grey1;
-}
-
-body[fds] .mat-radio-inner-circle {
-  height: 10px;
-  width: 10px;
-  left: 1px;
-  top: 1px;
-  background-color: #fff;
-}
-
-body[fds] .mat-radio-checked .mat-radio-inner-circle {
-  background-color: #fff;
+@mixin fds-radios-theme($theme) {
+$primaryColor: map-get(map-get($theme, primary), 500);
+$primaryColorHover: map-get(map-get($theme, primary), 100);
+$accentColor: map-get(map-get($theme, accent), 500);
+$accentColorHover: map-get(map-get($theme, accent), 100);
+
+body[fds] .mat-radio-container {
+height: 12px;
+width: 12px;
+}
+
+body[fds] .mat-radio-outer-circle {
+height: 12px;
+width: 12px;
+background-color: #fff;
+border: 1px solid $grey7;
+}
+
+body[fds] .mat-radio-outer-circle:hover {
+background-color: $accentColorHover;
+border-color: $accentColorHover;
+}
+
+body[fds] .mat-radio-checked .mat-radio-outer-circle {
+border: 1px solid $accentColor;
+background-color: $accentColor;
+}
+
+body[fds] .mat-radio-button.mat-accent.mat-radio-checked 
.mat-radio-outer-circle {
+border-color: $accentColor;
+}
+
+body[fds] .mat-radio-inner-circle {
+height: 10px;
+width: 10px;
+left: 1px;
+top: 1px;
+background-color: #fff;
+}
+
+body[fds] .mat-radio-checked .mat-radio-inner-circle {
+background-color: #fff;
+}
 }
diff --git a/platform/core/theming/_all-theme.scss 
b/platform/core/theming/_all-theme.scss
index 27682ca..690d792 100644
--- a/platform/core/theming/_all-theme.scss
+++ b/platform/core/theming/_all-theme.scss
@@ -24,6 +24,7 @@
 @import '../common/styles/checkboxes';
 @import '../common/styles/tables';
 @import '../common/styles/links';
+@import '../common/styles/radios';
 
 // Create a theme.
 @mixin fds-theme($theme) {
@@ -39,4 +40,5 @@
   @include fds-checkboxes-theme($theme);
   @include fds-tables-theme($theme);
   @include fds-links-theme($theme);
+  @include fds-radios-theme($theme);
 }

[nifi] branch master updated: NIFI-6409: Fixed issue with PutDatabaseRecord when driver doesn't support setObject() without type

2019-07-18 Thread pvillard 
This is an automated email from the ASF dual-hosted git repository.

pvillard pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/master by this push:
 new d8388c1  NIFI-6409: Fixed issue with PutDatabaseRecord when driver 
doesn't support setObject() without type
d8388c1 is described below

commit d8388c1887375ce5323114da24b56c74bf4658fc
Author: Matthew Burgess 
AuthorDate: Wed Jul 17 12:22:39 2019 -0400

NIFI-6409: Fixed issue with PutDatabaseRecord when driver doesn't support 
setObject() without type

Signed-off-by: Pierre Villard 

This closes #3585.
---
 .../serialization/record/util/DataTypeUtils.java   | 50 ++
 .../processors/standard/PutDatabaseRecord.java | 23 +++---
 .../standard/TestPutDatabaseRecord.groovy  |  6 +++
 3 files changed, 73 insertions(+), 6 deletions(-)

diff --git 
a/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/util/DataTypeUtils.java
 
b/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/util/DataTypeUtils.java
index 7fff72d..bab455a 100644
--- 
a/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/util/DataTypeUtils.java
+++ 
b/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/util/DataTypeUtils.java
@@ -41,6 +41,7 @@ import java.sql.Clob;
 import java.sql.Date;
 import java.sql.Time;
 import java.sql.Timestamp;
+import java.sql.Types;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -1607,6 +1608,55 @@ public class DataTypeUtils {
 }
 }
 
+/**
+ * Converts the specified field data type into a java.sql.Types constant 
(INTEGER = 4, e.g.)
+ *
+ * @param dataType the DataType to be converted
+ * @return the SQL type corresponding to the specified RecordFieldType
+ */
+public static int getSQLTypeValue(final DataType dataType) {
+if (dataType == null) {
+return Types.NULL;
+}
+RecordFieldType fieldType = dataType.getFieldType();
+switch (fieldType) {
+case BIGINT:
+case LONG:
+return Types.BIGINT;
+case BOOLEAN:
+return Types.BOOLEAN;
+case BYTE:
+return Types.TINYINT;
+case CHAR:
+return Types.CHAR;
+case DATE:
+return Types.DATE;
+case DOUBLE:
+return Types.DOUBLE;
+case FLOAT:
+return Types.FLOAT;
+case INT:
+return Types.INTEGER;
+case SHORT:
+return Types.SMALLINT;
+case STRING:
+return Types.VARCHAR;
+case TIME:
+return Types.TIME;
+case TIMESTAMP:
+return Types.TIMESTAMP;
+case ARRAY:
+return Types.ARRAY;
+case MAP:
+case RECORD:
+return Types.STRUCT;
+case CHOICE:
+throw new IllegalTypeConversionException("Cannot convert 
CHOICE, type must be explicit");
+default:
+throw new IllegalTypeConversionException("Cannot convert 
unknown type " + fieldType.name());
+}
+}
+
 public static boolean isScalarValue(final DataType dataType, final Object 
value) {
 final RecordFieldType fieldType = dataType.getFieldType();
 
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutDatabaseRecord.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutDatabaseRecord.java
index 3046cbf..8b4ad78 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutDatabaseRecord.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutDatabaseRecord.java
@@ -50,9 +50,11 @@ import org.apache.nifi.processor.util.pattern.RoutingResult;
 import org.apache.nifi.serialization.MalformedRecordException;
 import org.apache.nifi.serialization.RecordReader;
 import org.apache.nifi.serialization.RecordReaderFactory;
+import org.apache.nifi.serialization.record.DataType;
 import org.apache.nifi.serialization.record.Record;
 import org.apache.nifi.serialization.record.RecordField;
 import org.apache.nifi.serialization.record.RecordSchema;
+import org.apache.nifi.serialization.record.util.DataTypeUtils;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -687,26 +689,35 @@ public class PutDatabaseRecord extends 
AbstractSessionFactoryProcessor {
 
 while ((currentRecord = recordParser.nextRecord()) != null) {
 Object[] values

[nifi-fds] branch master updated: [NIFI-6447] update accent hover theme color

2019-07-18 Thread mcgilman 
This is an automated email from the ASF dual-hosted git repository.

mcgilman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-fds.git


The following commit(s) were added to refs/heads/master by this push:
 new d5c84fc  [NIFI-6447] update accent hover theme color
d5c84fc is described below

commit d5c84fce528cec3fd710e9ded135fe517eb12155
Author: Scott Aslan 
AuthorDate: Wed Jul 17 18:06:26 2019 -0400

[NIFI-6447] update accent hover theme color

This closes #35
---
 webapp/theming/fds-demo.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/theming/fds-demo.scss b/webapp/theming/fds-demo.scss
index 59217e9..bc79d7b 100644
--- a/webapp/theming/fds-demo.scss
+++ b/webapp/theming/fds-demo.scss
@@ -30,7 +30,7 @@
 $primaryColor: $rose1;
 $primaryColorHover: $rose2;
 $accentColor: $blue-grey1;
-$accentColorHover: $blue-grey2;
+$accentColorHover: $blue4;
 
 // Include the base styles for Angular Material core. We include this here so 
that you only
 // have to load a single css file for Angular Material in your app.

[nifi-fds] branch master updated: [NIFI-6447] update demo theme accent color

2019-07-18 Thread mcgilman 
This is an automated email from the ASF dual-hosted git repository.

mcgilman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-fds.git


The following commit(s) were added to refs/heads/master by this push:
 new 0ee2c47  [NIFI-6447] update demo theme accent color
0ee2c47 is described below

commit 0ee2c47c509d666b2b326de83ae0717826c4702b
Author: Scott Aslan 
AuthorDate: Wed Jul 17 15:12:22 2019 -0400

[NIFI-6447] update demo theme accent color

This closes #35
---
 webapp/theming/fds-demo.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/theming/fds-demo.scss b/webapp/theming/fds-demo.scss
index 3e9541e..59217e9 100644
--- a/webapp/theming/fds-demo.scss
+++ b/webapp/theming/fds-demo.scss
@@ -29,8 +29,8 @@
 //Change these
 $primaryColor: $rose1;
 $primaryColorHover: $rose2;
-$accentColor: $blue7;
-$accentColorHover: $grey4;
+$accentColor: $blue-grey1;
+$accentColorHover: $blue-grey2;
 
 // Include the base styles for Angular Material core. We include this here so 
that you only
 // have to load a single css file for Angular Material in your app.

[nifi] branch master updated: NIFI-6443 - ParseSyslog5424 n-th SD-ELEMENT isn't parsed

2019-07-18 Thread pvillard 
This is an automated email from the ASF dual-hosted git repository.

pvillard pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/master by this push:
 new 3fb4454  NIFI-6443 - ParseSyslog5424 n-th SD-ELEMENT isn't parsed
3fb4454 is described below

commit 3fb445437580bf47f1bec2b553aaff5424eb9eef
Author: mike 
AuthorDate: Thu Jul 18 14:29:41 2019 +1000

NIFI-6443 - ParseSyslog5424 n-th SD-ELEMENT isn't parsed

Signed-off-by: Pierre Villard 

This closes #3588.
---
 nifi-nar-bundles/nifi-extension-utils/nifi-syslog-utils/pom.xml  | 2 +-
 .../org/apache/nifi/syslog/BaseStrictSyslog5424ParserTest.java   | 9 +
 .../test/java/org/apache/nifi/syslog/TestSyslogRecordReader.java | 2 +-
 .../src/test/resources/syslog/syslog5424/log.txt | 2 +-
 .../src/test/resources/syslog/syslog5424/log_all.txt | 2 +-
 .../src/test/resources/syslog/syslog5424/log_mix.txt | 4 ++--
 .../src/test/resources/syslog/syslog5424/log_mix_in_error.txt| 4 ++--
 7 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-syslog-utils/pom.xml 
b/nifi-nar-bundles/nifi-extension-utils/nifi-syslog-utils/pom.xml
index 0c8caae..c282a66 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-syslog-utils/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-syslog-utils/pom.xml
@@ -26,7 +26,7 @@
 
 com.github.palindromicity
 simple-syslog-5424
-0.0.11
+0.0.13
 
 
 org.apache.nifi
diff --git 
a/nifi-nar-bundles/nifi-extension-utils/nifi-syslog-utils/src/test/java/org/apache/nifi/syslog/BaseStrictSyslog5424ParserTest.java
 
b/nifi-nar-bundles/nifi-extension-utils/nifi-syslog-utils/src/test/java/org/apache/nifi/syslog/BaseStrictSyslog5424ParserTest.java
index 6b19749..06c2084 100644
--- 
a/nifi-nar-bundles/nifi-extension-utils/nifi-syslog-utils/src/test/java/org/apache/nifi/syslog/BaseStrictSyslog5424ParserTest.java
+++ 
b/nifi-nar-bundles/nifi-extension-utils/nifi-syslog-utils/src/test/java/org/apache/nifi/syslog/BaseStrictSyslog5424ParserTest.java
@@ -157,7 +157,7 @@ public abstract class BaseStrictSyslog5424ParserTest {
 messages.add("<14>1 2014-06-20T09:14:07+00:00 loggregator"
 + " d0602076-b14a-4c55-852a-981e7afeed38 DEA MSG-01"
 + " [exampleSDID@32473 iut=\"3\" eventSource=\"Application\" 
eventID=\"1011\"]"
-+ " [exampleSDID@32480 iut=\"4\" eventSource=\"Other 
Application\" eventID=\"2022\"] Removing instance");
++ "[exampleSDID@32480 iut=\"4\" eventSource=\"Other 
Application\" eventID=\"2022\"] Removing instance");
 
 for (final String message : messages) {
 final byte[] bytes = message.getBytes(CHARSET);
@@ -181,7 +181,7 @@ public abstract class BaseStrictSyslog5424ParserTest {
 messages.add("<14>1 2014-06-20T09:14:07+00:00 loggregator"
 + " d0602076-b14a-4c55-852a-981e7afeed38 DEA MSG-01"
 + " [exampleSDID@32473 iut=\"3\" eventSource=\"Application\" 
eventID=\"1011\"]"
-+ " [exampleSDID@32480 iut=\"4\" eventSource=\"Other Application\" 
eventID=\"2022\"]");
++ "[exampleSDID@32480 iut=\"4\" eventSource=\"Other Application\" 
eventID=\"2022\"]");
 
 for (final String message : messages) {
 final byte[] bytes = message.getBytes(CHARSET);
@@ -191,7 +191,7 @@ public abstract class BaseStrictSyslog5424ParserTest {
 
 final Syslog5424Event event = parser.parseEvent(buffer);
 Assert.assertTrue(event.isValid());
-
Assert.assertNull(event.getFieldMap().get(SyslogAttributes.SYSLOG_BODY));
+
Assert.assertNull(event.getFieldMap().get(SyslogAttributes.SYSLOG_BODY.key()));
 }
 
 
@@ -218,7 +218,7 @@ public abstract class BaseStrictSyslog5424ParserTest {
 final String message = "<14>1 2014-06-20T09:14:07+00:00 loggregator"
 + " d0602076-b14a-4c55-852a-981e7afeed38 DEA MSG-01"
 + " [exampleSDID@32473 iut=\"3\" eventSource=\"Application\" 
eventID=\"1011\"]"
-+ " [exampleSDID@32480 iut=\"4\" eventSource=\"Other 
Application\" eventID=\"2022\"] Removing instance";
++ "[exampleSDID@32480 iut=\"4\" eventSource=\"Other 
Application\" eventID=\"2022\"] Removing instance";
 
 final byte[] bytes = message.getBytes(CHARSET);
 final ByteBuffer buffer = ByteBuffer.allocate(bytes.length);
@@ -229,5 +229,6 @@ public abstract class BaseStrictSyslog5424ParserTest {
 Assert.assertNotNull(event);
 Assert.assertTrue(event.isValid());
 Assert.assertEquals(sender, event.getSender());
+Assert.assertEquals("Removing instance", 
event.getFieldMap().get(SyslogAttributes.SYSLOG_BODY.key()));
 }
 }
diff --git 
a/nifi-nar-bundles/nifi-standard-s