import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.Properties;
import org.apache.commons.lang3.StringUtils;
protected static final String PROP_ML_DISTRIBUTION_ASDC_CONNECTION_DISABLED =
PREFIX_DISTRIBUTION_CLIENT + "ASDC_CONNECTION_DISABLE";
protected static final String PROP_ML_DISTRIBUTION_ASDC_ADDRESS = PREFIX_DISTRIBUTION_CLIENT + "ASDC_ADDRESS";
+ protected static final String PROP_ML_DISTRIBUTION_ASDC_USE_HTTPS = PREFIX_DISTRIBUTION_CLIENT + "ASDC_USE_HTTPS";
protected static final String PROP_ML_DISTRIBUTION_CONSUMER_GROUP = PREFIX_DISTRIBUTION_CLIENT + "CONSUMER_GROUP";
protected static final String PROP_ML_DISTRIBUTION_CONSUMER_ID = PREFIX_DISTRIBUTION_CLIENT + "CONSUMER_ID";
protected static final String PROP_ML_DISTRIBUTION_ENVIRONMENT_NAME =
// Get list of artifact types
String types = get(PROP_ML_DISTRIBUTION_ARTIFACT_TYPES);
if (types != null) {
- for (String artType : types.split(",")) {
- artifactTypes.add(artType);
- }
+ artifactTypes.addAll(Arrays.asList(types.split(",")));
}
// Get list of message bus addresses
String addresses = get(PROP_ML_DISTRIBUTION_MSG_BUS_ADDRESSES);
if (addresses != null) {
- for (String addr : addresses.split(",")) {
- msgBusAddrs.add(addr);
- }
+ msgBusAddrs.addAll(Arrays.asList(addresses.split(",")));
}
}
@Override
public boolean activateServerTLSAuth() {
String value = get(PROP_ML_DISTRIBUTION_ACTIVE_SERVER_TLS_AUTH);
- return value != null && Boolean.parseBoolean(value);
+ return Boolean.parseBoolean(value);
}
@Override
return get(PROP_ML_DISTRIBUTION_ASDC_ADDRESS);
}
+ @Override
+ public Boolean isUseHttpsWithSDC() {
+ /* if PROP_ML_DISTRIBUTION_ASDC_USE_HTTPS is null, https will be used, as before */
+ String value = get(PROP_ML_DISTRIBUTION_ASDC_USE_HTTPS);
+ if (value == null) {
+ return true;
+ }
+ return Boolean.parseBoolean(value);
+ }
+
@Override
public String getConsumerGroup() {
return get(PROP_ML_DISTRIBUTION_CONSUMER_GROUP);
/**
* Read the value of the property and replace any wildcard OXM version "v*" with the supplied default OXM version
- *
+ *
* @param propertyName
* the name of the property storing the OXM version (possibly containing v*)
* @param version