You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by yk...@apache.org on 2021/01/27 09:05:22 UTC
[incubator-datalab] branch DATALAB-2232 updated: DATALAB-2232 --
added licence
This is an automated email from the ASF dual-hosted git repository.
ykinash pushed a commit to branch DATALAB-2232
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/DATALAB-2232 by this push:
new dcff0e5 DATALAB-2232 -- added licence
dcff0e5 is described below
commit dcff0e5ad76bd13e8169976dc29d18ffc493b438
Author: KinashYurii <ur...@gmail.com>
AuthorDate: Wed Jan 27 11:05:06 2021 +0200
DATALAB-2232 -- added licence
---
.../DynamicChangePropertiesException.java | 19 +++++++++++++++++
...lCreateGCP.java => ComputationalCreateGcp.java} | 24 +++++++++++-----------
.../DynamicChangePropertiesExceptionMapper.java | 20 ++++++++++++++++++
.../resources/gcp/ComputationalResourceGcp.java | 4 ++--
.../service/impl/DynamicChangeProperties.java | 19 +++++++++++++++++
.../datalab/backendapi/util/RequestBuilder.java | 4 ++--
6 files changed, 74 insertions(+), 16 deletions(-)
diff --git a/services/common/src/main/java/com/epam/datalab/exceptions/DynamicChangePropertiesException.java b/services/common/src/main/java/com/epam/datalab/exceptions/DynamicChangePropertiesException.java
index 68550ae..a43e520 100644
--- a/services/common/src/main/java/com/epam/datalab/exceptions/DynamicChangePropertiesException.java
+++ b/services/common/src/main/java/com/epam/datalab/exceptions/DynamicChangePropertiesException.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.epam.datalab.exceptions;
public class DynamicChangePropertiesException extends DatalabException {
diff --git a/services/datalab-model/src/main/java/com/epam/datalab/dto/gcp/computational/ComputationalCreateGCP.java b/services/datalab-model/src/main/java/com/epam/datalab/dto/gcp/computational/ComputationalCreateGcp.java
similarity index 83%
rename from services/datalab-model/src/main/java/com/epam/datalab/dto/gcp/computational/ComputationalCreateGCP.java
rename to services/datalab-model/src/main/java/com/epam/datalab/dto/gcp/computational/ComputationalCreateGcp.java
index acbfa59..b4b169f 100644
--- a/services/datalab-model/src/main/java/com/epam/datalab/dto/gcp/computational/ComputationalCreateGCP.java
+++ b/services/datalab-model/src/main/java/com/epam/datalab/dto/gcp/computational/ComputationalCreateGcp.java
@@ -23,7 +23,7 @@ import com.epam.datalab.dto.base.computational.ComputationalBase;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.MoreObjects;
-public class ComputationalCreateGCP extends ComputationalBase<ComputationalCreateGCP> {
+public class ComputationalCreateGcp extends ComputationalBase<ComputationalCreateGcp> {
@JsonProperty("dataproc_master_count")
private String masterInstanceCount;
@JsonProperty("dataproc_slave_count")
@@ -47,52 +47,52 @@ public class ComputationalCreateGCP extends ComputationalBase<ComputationalCreat
@JsonProperty("slaveGPUCount")
private String slaveGPUCount;
- public ComputationalCreateGCP withMasterInstanceCount(String masterInstanceCount) {
+ public ComputationalCreateGcp withMasterInstanceCount(String masterInstanceCount) {
this.masterInstanceCount = masterInstanceCount;
return this;
}
- public ComputationalCreateGCP withSlaveInstanceCount(String slaveInstanceCount) {
+ public ComputationalCreateGcp withSlaveInstanceCount(String slaveInstanceCount) {
this.slaveInstanceCount = slaveInstanceCount;
return this;
}
- public ComputationalCreateGCP withMasterInstanceType(String masterInstanceType) {
+ public ComputationalCreateGcp withMasterInstanceType(String masterInstanceType) {
this.masterInstanceType = masterInstanceType;
return this;
}
- public ComputationalCreateGCP withSlaveInstanceType(String slaveInstanceType) {
+ public ComputationalCreateGcp withSlaveInstanceType(String slaveInstanceType) {
this.slaveInstanceType = slaveInstanceType;
return this;
}
- public ComputationalCreateGCP withPreemptibleCount(String preemptibleCount) {
+ public ComputationalCreateGcp withPreemptibleCount(String preemptibleCount) {
this.preemptibleCount = preemptibleCount;
return this;
}
- public ComputationalCreateGCP withVersion(String version) {
+ public ComputationalCreateGcp withVersion(String version) {
this.version = version;
return this;
}
- public ComputationalCreateGCP withMasterGPUType(String masterGPUType) {
+ public ComputationalCreateGcp withMasterGPUType(String masterGPUType) {
this.masterGPUType = masterGPUType;
return this;
}
- public ComputationalCreateGCP withSlaveGPUType(String slaveGPUType) {
+ public ComputationalCreateGcp withSlaveGPUType(String slaveGPUType) {
this.slaveGPUType = slaveGPUType;
return this;
}
- public ComputationalCreateGCP withMasterGPUCount(String masterGPUCount) {
+ public ComputationalCreateGcp withMasterGPUCount(String masterGPUCount) {
this.masterGPUCount = masterGPUCount;
return this;
}
- public ComputationalCreateGCP withSlaveGPUCount(String slaveGPUCount) {
+ public ComputationalCreateGcp withSlaveGPUCount(String slaveGPUCount) {
this.slaveGPUCount = slaveGPUCount;
return this;
}
@@ -107,7 +107,7 @@ public class ComputationalCreateGCP extends ComputationalBase<ComputationalCreat
this.sharedImageEnabled = sharedImageEnabled;
}
- public ComputationalCreateGCP withSharedImageEnabled(String sharedImageEnabled) {
+ public ComputationalCreateGcp withSharedImageEnabled(String sharedImageEnabled) {
setSharedImageEnabled(sharedImageEnabled);
return this;
}
diff --git a/services/datalab-webapp-common/src/main/java/com/epam/datalab/rest/mappers/DynamicChangePropertiesExceptionMapper.java b/services/datalab-webapp-common/src/main/java/com/epam/datalab/rest/mappers/DynamicChangePropertiesExceptionMapper.java
index 6408b16..b4ab320 100644
--- a/services/datalab-webapp-common/src/main/java/com/epam/datalab/rest/mappers/DynamicChangePropertiesExceptionMapper.java
+++ b/services/datalab-webapp-common/src/main/java/com/epam/datalab/rest/mappers/DynamicChangePropertiesExceptionMapper.java
@@ -1,3 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
package com.epam.datalab.rest.mappers;
import com.epam.datalab.exceptions.DynamicChangePropertiesException;
diff --git a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/resources/gcp/ComputationalResourceGcp.java b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/resources/gcp/ComputationalResourceGcp.java
index ce78cf9..0ff68f0 100644
--- a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/resources/gcp/ComputationalResourceGcp.java
+++ b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/resources/gcp/ComputationalResourceGcp.java
@@ -34,7 +34,7 @@ import com.epam.datalab.dto.base.computational.ComputationalBase;
import com.epam.datalab.dto.computational.ComputationalClusterConfigDTO;
import com.epam.datalab.dto.computational.ComputationalStartDTO;
import com.epam.datalab.dto.computational.ComputationalStopDTO;
-import com.epam.datalab.dto.gcp.computational.ComputationalCreateGCP;
+import com.epam.datalab.dto.gcp.computational.ComputationalCreateGcp;
import com.epam.datalab.dto.gcp.computational.GcpComputationalTerminateDTO;
import com.epam.datalab.dto.gcp.computational.SparkComputationalCreateGcp;
import com.epam.datalab.exceptions.DatalabException;
@@ -67,7 +67,7 @@ public class ComputationalResourceGcp extends DockerService implements DockerCom
@POST
@Path(ComputationalAPI.COMPUTATIONAL_CREATE_CLOUD_SPECIFIC)
- public String create(@Auth UserInfo ui, ComputationalCreateGCP dto) {
+ public String create(@Auth UserInfo ui, ComputationalCreateGcp dto) {
log.debug("Create computational resources {} for user {}: {}", dto.getComputationalName(), ui.getName(), dto);
String uuid = DockerCommands.generateUUID();
folderListenerExecutor.start(configuration.getImagesDirectory(),
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/DynamicChangeProperties.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/DynamicChangeProperties.java
index 5ea27f8..52c5b69 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/DynamicChangeProperties.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/DynamicChangeProperties.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package com.epam.datalab.backendapi.service.impl;
import com.epam.datalab.backendapi.annotation.Audit;
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/util/RequestBuilder.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/util/RequestBuilder.java
index 8949a52..a2fb984 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/util/RequestBuilder.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/util/RequestBuilder.java
@@ -69,7 +69,7 @@ import com.epam.datalab.dto.exploratory.ExploratoryReconfigureSparkClusterAction
import com.epam.datalab.dto.exploratory.LibInstallDTO;
import com.epam.datalab.dto.exploratory.LibraryInstallDTO;
import com.epam.datalab.dto.gcp.GcpCloudSettings;
-import com.epam.datalab.dto.gcp.computational.ComputationalCreateGCP;
+import com.epam.datalab.dto.gcp.computational.ComputationalCreateGcp;
import com.epam.datalab.dto.gcp.computational.GcpComputationalTerminateDTO;
import com.epam.datalab.dto.gcp.computational.SparkComputationalCreateGcp;
import com.epam.datalab.dto.gcp.exploratory.ExploratoryCreateGcp;
@@ -368,7 +368,7 @@ public class RequestBuilder {
break;
case GCP:
GcpComputationalCreateForm gcpForm = (GcpComputationalCreateForm) form;
- computationalCreate = (T) newResourceSysBaseDTO(userInfo.getName(), cloudProvider, ComputationalCreateGCP.class)
+ computationalCreate = (T) newResourceSysBaseDTO(userInfo.getName(), cloudProvider, ComputationalCreateGcp.class)
.withMasterInstanceCount(gcpForm.getMasterInstanceCount())
.withSlaveInstanceCount(gcpForm.getSlaveInstanceCount())
.withPreemptibleCount(gcpForm.getPreemptibleCount())
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org