fix apache license (#293)

clouddea · yuanf · web-flow · commit cf7eaa1c737b · 2023-08-01T19:47:30.000+08:00
* fix license

Signed-off-by: yuanf &lt;yuanf@dmetasoul.com&gt;

---------

Signed-off-by: yuanf &lt;yuanf@dmetasoul.com&gt;
Co-authored-by: yuanf &lt;yuanf@dmetasoul.com&gt;
diff --git a/lakesoul-common/src/main/java/com/dmetasoul/lakesoul/meta/GlobalConfig.java b/lakesoul-common/src/main/java/com/dmetasoul/lakesoul/meta/GlobalConfig.java
@@ -2,20 +2,6 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-/*
- * Licensed 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.dmetasoul.lakesoul.meta;
 
 import org.slf4j.Logger;
diff --git a/lakesoul-common/src/main/java/com/dmetasoul/lakesoul/meta/rbac/AuthZAfter.java b/lakesoul-common/src/main/java/com/dmetasoul/lakesoul/meta/rbac/AuthZAfter.java
@@ -1,19 +1,7 @@
-/*
- * Copyright [2022] [DMetaSoul Team]
- *
- * Licensed 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.
- *
- */
+// SPDX-FileCopyrightText: 2023 LakeSoul Contributors
+//
+// SPDX-License-Identifier: Apache-2.0
+
 package com.dmetasoul.lakesoul.meta.rbac;
 
 import com.dmetasoul.lakesoul.meta.rbac.fetcher.AuthZFetcher;
diff --git a/lakesoul-common/src/main/java/com/dmetasoul/lakesoul/meta/rbac/AuthZBefore.java b/lakesoul-common/src/main/java/com/dmetasoul/lakesoul/meta/rbac/AuthZBefore.java
@@ -1,19 +1,7 @@
-/*
- * Copyright [2022] [DMetaSoul Team]
- *
- * Licensed 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.
- *
- */
+// SPDX-FileCopyrightText: 2023 LakeSoul Contributors
+//
+// SPDX-License-Identifier: Apache-2.0
+
 package com.dmetasoul.lakesoul.meta.rbac;
 
 import com.dmetasoul.lakesoul.meta.rbac.fetcher.AuthZFetcher;
diff --git a/lakesoul-common/src/main/java/com/dmetasoul/lakesoul/meta/rbac/AuthZEnforcer.java b/lakesoul-common/src/main/java/com/dmetasoul/lakesoul/meta/rbac/AuthZEnforcer.java
@@ -2,20 +2,6 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-/*
- * Licensed 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.dmetasoul.lakesoul.meta.rbac;
 
 import com.dmetasoul.lakesoul.meta.DBConnector;
diff --git a/lakesoul-common/src/main/java/com/dmetasoul/lakesoul/meta/rbac/fetcher/AuthZFetcher.java b/lakesoul-common/src/main/java/com/dmetasoul/lakesoul/meta/rbac/fetcher/AuthZFetcher.java
@@ -1,19 +1,6 @@
-/*
- * Copyright [2022] [DMetaSoul Team]
- *
- * Licensed 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.
- *
- */
+// SPDX-FileCopyrightText: 2023 LakeSoul Contributors
+//
+// SPDX-License-Identifier: Apache-2.0
 
 package com.dmetasoul.lakesoul.meta.rbac.fetcher;
 
diff --git a/lakesoul-common/src/main/java/com/dmetasoul/lakesoul/meta/rbac/fetcher/AuthZIdentFetcher.java b/lakesoul-common/src/main/java/com/dmetasoul/lakesoul/meta/rbac/fetcher/AuthZIdentFetcher.java
@@ -1,19 +1,7 @@
-/*
- * Copyright [2022] [DMetaSoul Team]
- *
- * Licensed 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.
- *
- */
+// SPDX-FileCopyrightText: 2023 LakeSoul Contributors
+//
+// SPDX-License-Identifier: Apache-2.0
+
 package com.dmetasoul.lakesoul.meta.rbac.fetcher;
 
 import java.util.LinkedList;
diff --git a/lakesoul-common/src/main/java/com/dmetasoul/lakesoul/meta/rbac/fetcher/AuthZNullFetcher.java b/lakesoul-common/src/main/java/com/dmetasoul/lakesoul/meta/rbac/fetcher/AuthZNullFetcher.java
@@ -1,19 +1,6 @@
-/*
- * Copyright [2022] [DMetaSoul Team]
- *
- * Licensed 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.
- *
- */
+// SPDX-FileCopyrightText: 2023 LakeSoul Contributors
+//
+// SPDX-License-Identifier: Apache-2.0
 
 package com.dmetasoul.lakesoul.meta.rbac.fetcher;
 
diff --git a/lakesoul-common/src/main/java/com/dmetasoul/lakesoul/meta/rbac/fetcher/AuthZParamFetcher.java b/lakesoul-common/src/main/java/com/dmetasoul/lakesoul/meta/rbac/fetcher/AuthZParamFetcher.java
@@ -1,19 +1,7 @@
-/*
- * Copyright [2022] [DMetaSoul Team]
- *
- * Licensed 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.
- *
- */
+// SPDX-FileCopyrightText: 2023 LakeSoul Contributors
+//
+// SPDX-License-Identifier: Apache-2.0
+
 package com.dmetasoul.lakesoul.meta.rbac.fetcher;
 
 import com.dmetasoul.lakesoul.meta.rbac.AuthZBefore;
diff --git a/lakesoul-common/src/main/java/com/dmetasoul/lakesoul/meta/rbac/fetcher/TableReadFetcher.java b/lakesoul-common/src/main/java/com/dmetasoul/lakesoul/meta/rbac/fetcher/TableReadFetcher.java
@@ -1,19 +1,6 @@
-/*
- * Copyright [2022] [DMetaSoul Team]
- *
- * Licensed 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.
- *
- */
+// SPDX-FileCopyrightText: 2023 LakeSoul Contributors
+//
+// SPDX-License-Identifier: Apache-2.0
 
 package com.dmetasoul.lakesoul.meta.rbac.fetcher;
 
diff --git a/lakesoul-common/src/main/java/com/dmetasoul/lakesoul/meta/rbac/fetcher/TableWriteFetcher.java b/lakesoul-common/src/main/java/com/dmetasoul/lakesoul/meta/rbac/fetcher/TableWriteFetcher.java
@@ -1,19 +1,7 @@
-/*
- * Copyright [2022] [DMetaSoul Team]
- *
- * Licensed 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.
- *
- */
+// SPDX-FileCopyrightText: 2023 LakeSoul Contributors
+//
+// SPDX-License-Identifier: Apache-2.0
+
 package com.dmetasoul.lakesoul.meta.rbac.fetcher;
 
 import com.dmetasoul.lakesoul.meta.entity.MetaInfo;
diff --git a/lakesoul-flink/src/test/java/com/dmetasoul/lakesoul/meta/LakeSoulRBACTest.java b/lakesoul-flink/src/test/java/com/dmetasoul/lakesoul/meta/LakeSoulRBACTest.java
@@ -1,3 +1,7 @@
+// SPDX-FileCopyrightText: 2023 LakeSoul Contributors
+//
+// SPDX-License-Identifier: Apache-2.0
+
 package com.dmetasoul.lakesoul.meta;
 
 import org.apache.flink.lakesoul.test.LakeSoulFlinkTestBase;
diff --git a/lakesoul-flink/src/test/java/org/apache/flink/lakesoul/test/AbstractTestBase.java b/lakesoul-flink/src/test/java/org/apache/flink/lakesoul/test/AbstractTestBase.java
@@ -2,19 +2,6 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-/*
- *  Licensed 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 org.apache.flink.lakesoul.test;
 
 import org.apache.flink.configuration.Configuration;
diff --git a/lakesoul-flink/src/test/java/org/apache/flink/lakesoul/test/DebugMain.java b/lakesoul-flink/src/test/java/org/apache/flink/lakesoul/test/DebugMain.java
@@ -2,19 +2,6 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-/*
- *  Licensed 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 org.apache.flink.lakesoul.test;
 
 import org.apache.flink.core.fs.FileSystem;
diff --git a/lakesoul-spark/src/test/scala/com/dmetasoul/lakesoul/meta/RBACOperatinSuite.scala b/lakesoul-spark/src/test/scala/com/dmetasoul/lakesoul/meta/RBACOperatinSuite.scala
@@ -36,9 +36,9 @@ class RBACOperatinSuite extends QueryTest
   final val DOMAIN2: String = "domain2"
 
   def login(username: String, password: String, domain: String): Unit = {
-    println("TEST: LOGIN USEERNAME " + username)
-    println("TEST: LOGIN USEERNAME " + password)
-    println("TEST: LOGIN USEERNAME " + domain)
+    println("TEST: LOGIN USERNAME " + username)
+    println("TEST: LOGIN PASSWORD " + password)
+    println("TEST: LOGIN DOMAIN " + domain)
     System.setProperty(DBUtil.usernameKey, username)
     System.setProperty(DBUtil.passwordKey, password)
     System.setProperty(DBUtil.domainKey, domain)
