Skip to content

Commit 5e8c612

Browse files
committed
format
1 parent 06c8300 commit 5e8c612

File tree

6 files changed

+18
-8
lines changed

6 files changed

+18
-8
lines changed

fe/fe-enterprise/src/main/java/org/apache/doris/enterprise/KeyManager.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
package org.apache.doris.enterprise;
1919

2020
import org.apache.doris.catalog.Env;
21-
import org.apache.doris.common.AnalysisException;
2221
import org.apache.doris.common.Config;
2322
import org.apache.doris.encryption.DataKeyMaterial;
2423
import org.apache.doris.encryption.EncryptionKey;

fe/fe-enterprise/src/main/java/org/apache/doris/enterprise/KmsRootKeyProvider.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
import org.apache.doris.encryption.DataKeyMaterial;
2121
import org.apache.doris.encryption.RootKeyInfo;
2222

23-
import java.util.Map;
24-
2523
class KmsRootKeyProvider implements RootKeyProvider {
2624
@Override
2725
public void init(RootKeyInfo info) {

fe/fe-enterprise/src/main/java/org/apache/doris/enterprise/LocalRootKeyProvider.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
import java.nio.charset.StandardCharsets;
2424
import java.security.spec.KeySpec;
25-
import java.util.Map;
2625
import javax.crypto.Cipher;
2726
import javax.crypto.SecretKey;
2827
import javax.crypto.SecretKeyFactory;

fe/fe-enterprise/src/main/java/org/apache/doris/enterprise/RootKeyProvider.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
import org.apache.doris.encryption.DataKeyMaterial;
2121
import org.apache.doris.encryption.RootKeyInfo;
2222

23-
import java.util.Map;
24-
2523
public interface RootKeyProvider {
2624

2725
void init(RootKeyInfo info);

fe/fe-enterprise/src/test/java/org/apache/doris/enterprise/KeyManagerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ public void testRotateRootKey(@Mocked Env env, @Mocked EditLog editLog) {
155155
manager.rotateRootKey(properties);
156156
Assert.fail();
157157
} catch (Exception e) {
158-
158+
// do nothing
159159
}
160160
}
161161
}

fe/fe-enterprise/src/test/java/org/apache/doris/enterprise/MockedRootKeyProvider.java

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,26 @@
1+
// Licensed to the Apache Software Foundation (ASF) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The ASF licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
17+
118
package org.apache.doris.enterprise;
219

320
import org.apache.doris.encryption.DataKeyMaterial;
421
import org.apache.doris.encryption.RootKeyInfo;
522

623
import java.nio.charset.StandardCharsets;
7-
import java.util.Arrays;
824
import java.util.concurrent.atomic.AtomicInteger;
925

1026
public class MockedRootKeyProvider implements RootKeyProvider {

0 commit comments

Comments
 (0)