Skip to content

Commit

Permalink
Merge branch 'backport-4162' into release-2.0.x
Browse files Browse the repository at this point in the history
  • Loading branch information
Coduz committed Jan 10, 2025
2 parents 4cbd4e6 + e7a9cfc commit cd620f7
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
*******************************************************************************/
package org.eclipse.kapua.service.device.management.keystore.job.definition;

import com.beust.jcommander.internal.Lists;
import org.eclipse.kapua.model.id.KapuaId;
import org.eclipse.kapua.service.device.management.keystore.DeviceKeystoreManagementService;
import org.eclipse.kapua.service.device.management.keystore.job.DeviceKeystoreCertificateCreateTargetProcessor;
Expand All @@ -22,6 +21,7 @@
import org.eclipse.kapua.service.job.step.definition.JobStepPropertyRecord;
import org.eclipse.kapua.service.job.step.definition.JobStepType;
import org.eclipse.kapua.service.job.step.definition.device.management.TimeoutJobStepPropertyRecord;
import com.beust.jcommander.internal.Lists;

/**
* {@link JobStepDefinition} to perform {@link DeviceKeystoreManagementService#createKeystoreCertificate(KapuaId, KapuaId, DeviceKeystoreCertificate, Long)}.
Expand All @@ -43,7 +43,7 @@ public DeviceKeystoreCertificateCreateJobStepDefinition() {
Lists.newArrayList(
new JobStepPropertyRecord(
DeviceKeystoreCertificateCreatePropertyKeys.KEYSTORE_ID,
"Identifier of the device keystore where the certificate will be added",
"Identifier of the device keystore where the certificate will be added. The identifier can be found in the Key Stores view within the Device Overview page or can be retrieved via the REST API",
String.class.getName(),
null,
"SSLKeystore",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
*******************************************************************************/
package org.eclipse.kapua.service.device.management.keystore.job.definition;

import com.beust.jcommander.internal.Lists;
import org.eclipse.kapua.model.id.KapuaId;
import org.eclipse.kapua.service.device.management.keystore.DeviceKeystoreManagementService;
import org.eclipse.kapua.service.device.management.keystore.job.DeviceKeystoreItemDeleteTargetProcessor;
Expand All @@ -21,6 +20,7 @@
import org.eclipse.kapua.service.job.step.definition.JobStepPropertyRecord;
import org.eclipse.kapua.service.job.step.definition.JobStepType;
import org.eclipse.kapua.service.job.step.definition.device.management.TimeoutJobStepPropertyRecord;
import com.beust.jcommander.internal.Lists;

/**
* {@link JobStepDefinition} to perform {@link DeviceKeystoreManagementService#deleteKeystoreItem(KapuaId, KapuaId, String, String, Long)}
Expand All @@ -42,7 +42,7 @@ public DeviceKeystoreItemDeleteJobStepDefinition() {
Lists.newArrayList(
new JobStepPropertyRecord(
DeviceKeystoreItemDeletePropertyKeys.KEYSTORE_ID,
"Identifier of the device keystore where the certificate will be removed",
"Identifier of the device keystore where the certificate will be removed. The identifier can be found in the Key Stores view within the Device Overview page or can be retrieved via the REST API",
String.class.getName(),
null,
"SSLKeystore",
Expand All @@ -55,7 +55,7 @@ public DeviceKeystoreItemDeleteJobStepDefinition() {
null),
new JobStepPropertyRecord(
DeviceKeystoreItemDeletePropertyKeys.ALIAS,
"Alias of the certificate in the destination keystore",
"Alias of the certificate. The Alias can be found in the Key Stores view within the Device Overview page or can be retrieved via the REST API",
String.class.getName(),
null,
"ssl-eclipse",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
*******************************************************************************/
package org.eclipse.kapua.service.device.management.keystore.job.definition;

import com.beust.jcommander.internal.Lists;
import org.eclipse.kapua.model.id.KapuaId;
import org.eclipse.kapua.service.device.management.keystore.DeviceKeystoreManagementService;
import org.eclipse.kapua.service.device.management.keystore.job.DeviceKeystoreKeypairCreateTargetProcessor;
Expand All @@ -22,6 +21,7 @@
import org.eclipse.kapua.service.job.step.definition.JobStepPropertyRecord;
import org.eclipse.kapua.service.job.step.definition.JobStepType;
import org.eclipse.kapua.service.job.step.definition.device.management.TimeoutJobStepPropertyRecord;
import com.beust.jcommander.internal.Lists;

/**
* {@link JobStepDefinition} to perform {@link DeviceKeystoreManagementService#createKeystoreKeypair(KapuaId, KapuaId, DeviceKeystoreKeypair, Long)}
Expand All @@ -43,7 +43,7 @@ public DeviceKeystoreKeypairCreateJobStepDefinition() {
Lists.newArrayList(
new JobStepPropertyRecord(
DeviceKeystoreKeypairCreatePropertyKeys.KEYSTORE_ID,
"Identifier of the device keystore where the certificate will be added",
"Identifier of the device keystore where the certificate will be added. The identifier can be found in the Key Stores view within the Device Overview page or can be retrieved via the REST API",
String.class.getName(),
null,
"SSLKeystore",
Expand Down

0 comments on commit cd620f7

Please sign in to comment.