nifi-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alopresto <...@git.apache.org>
Subject [GitHub] nifi pull request: NIFI-1257 and 1259
Date Tue, 02 Feb 2016 20:17:16 GMT
Github user alopresto commented on a diff in the pull request:

    https://github.com/apache/nifi/pull/201#discussion_r51628287
  
    --- Diff: nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EncryptContent.java
---
    @@ -68,70 +73,78 @@
         public static final String DECRYPT_MODE = "Decrypt";
     
         public static final PropertyDescriptor MODE = new PropertyDescriptor.Builder()
    -        .name("Mode")
    -        .description("Specifies whether the content should be encrypted or decrypted")
    -        .required(true)
    -        .allowableValues(ENCRYPT_MODE, DECRYPT_MODE)
    -        .defaultValue(ENCRYPT_MODE)
    -        .build();
    +            .name("Mode")
    +            .description("Specifies whether the content should be encrypted or decrypted")
    +            .required(true)
    +            .allowableValues(ENCRYPT_MODE, DECRYPT_MODE)
    +            .defaultValue(ENCRYPT_MODE)
    +            .build();
         public static final PropertyDescriptor KEY_DERIVATION_FUNCTION = new PropertyDescriptor.Builder()
    -        .name("key-derivation-function")
    -        .displayName("Key Derivation Function")
    -        .description("Specifies the key derivation function to generate the key from
the password (and salt)")
    -        .required(true)
    -        .allowableValues(KeyDerivationFunction.values())
    -        .defaultValue(KeyDerivationFunction.NIFI_LEGACY.name())
    -        .build();
    +            .name("key-derivation-function")
    +            .displayName("Key Derivation Function")
    +            .description("Specifies the key derivation function to generate the key from
the password (and salt)")
    +            .required(true)
    +            .allowableValues(buildKeyDerivationFunctionAllowableValues())
    +            .defaultValue(KeyDerivationFunction.NIFI_LEGACY.name())
    +            .build();
         public static final PropertyDescriptor ENCRYPTION_ALGORITHM = new PropertyDescriptor.Builder()
    -        .name("Encryption Algorithm")
    -        .description("The Encryption Algorithm to use")
    -        .required(true)
    -        .allowableValues(EncryptionMethod.values())
    -        .defaultValue(EncryptionMethod.MD5_128AES.name())
    -        .build();
    +            .name("Encryption Algorithm")
    +            .description("The Encryption Algorithm to use")
    +            .required(true)
    +            .allowableValues(buildEncryptionMethodAllowableValues())
    +            .defaultValue(EncryptionMethod.MD5_128AES.name())
    +            .build();
         public static final PropertyDescriptor PASSWORD = new PropertyDescriptor.Builder()
    -        .name("Password")
    -        .description("The Password to use for encrypting or decrypting the data")
    -        .required(false)
    -        .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
    -        .sensitive(true)
    -        .build();
    +            .name("Password")
    +            .description("The Password to use for encrypting or decrypting the data")
    +            .required(false)
    +            .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
    +            .sensitive(true)
    +            .build();
         public static final PropertyDescriptor PUBLIC_KEYRING = new PropertyDescriptor.Builder()
    -        .name("public-keyring-file")
    -        .displayName("Public Keyring File")
    -        .description("In a PGP encrypt mode, this keyring contains the public key of
the recipient")
    -        .required(false)
    -        .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
    -        .build();
    +            .name("public-keyring-file")
    +            .displayName("Public Keyring File")
    +            .description("In a PGP encrypt mode, this keyring contains the public key
of the recipient")
    +            .required(false)
    +            .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
    +            .build();
         public static final PropertyDescriptor PUBLIC_KEY_USERID = new PropertyDescriptor.Builder()
    -        .name("public-key-user-id")
    -        .displayName("Public Key User Id")
    -        .description("In a PGP encrypt mode, this user id of the recipient")
    -        .required(false)
    -        .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
    -        .build();
    +            .name("public-key-user-id")
    +            .displayName("Public Key User Id")
    +            .description("In a PGP encrypt mode, this user id of the recipient")
    +            .required(false)
    +            .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
    +            .build();
         public static final PropertyDescriptor PRIVATE_KEYRING = new PropertyDescriptor.Builder()
    -        .name("private-keyring-file")
    -        .displayName("Private Keyring File")
    -        .description("In a PGP decrypt mode, this keyring contains the private key of
the recipient")
    -        .required(false)
    -        .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
    -        .build();
    +            .name("private-keyring-file")
    +            .displayName("Private Keyring File")
    +            .description("In a PGP decrypt mode, this keyring contains the private key
of the recipient")
    +            .required(false)
    +            .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
    +            .build();
         public static final PropertyDescriptor PRIVATE_KEYRING_PASSPHRASE = new PropertyDescriptor.Builder()
    -        .name("private-keyring-passphrase")
    -        .displayName("Private Keyring Passphrase")
    -        .description("In a PGP decrypt mode, this is the private keyring passphrase")
    -        .required(false)
    -        .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
    -        .sensitive(true)
    -        .build();
    -
    +            .name("private-keyring-passphrase")
    +            .displayName("Private Keyring Passphrase")
    +            .description("In a PGP decrypt mode, this is the private keyring passphrase")
    +            .required(false)
    +            .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
    +            .sensitive(true)
    +            .build();
    +    public static final PropertyDescriptor RAW_KEY_HEX = new PropertyDescriptor.Builder()
    +            .name("raw-key-hex")
    +            .displayName("Raw key (hexadecimal)")
    --- End diff --
    
    I copied the casing and style for `name` from `private-keyring-passphrase` which was an
existing property descriptor. Or were you talking about the `displayName` attribute? I will
fix that. 


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message