adoroszlai commented on code in PR #9370:
URL: https://github.com/apache/ozone/pull/9370#discussion_r2574079309
##########
hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/OzoneOutputStream.java:
##########
@@ -139,36 +139,28 @@ public OmMultipartCommitUploadPartInfo
getCommitUploadPartInfo() {
public OutputStream getOutputStream() {
return outputStream;
}
-
+
public KeyOutputStream getKeyOutputStream() {
- if (outputStream instanceof KeyOutputStream) {
- return ((KeyOutputStream) outputStream);
- } else if (outputStream instanceof CryptoOutputStream) {
- OutputStream wrappedStream =
- ((CryptoOutputStream) outputStream).getWrappedStream();
- if (wrappedStream instanceof KeyOutputStream) {
- return ((KeyOutputStream) wrappedStream);
- }
- } else if (outputStream instanceof CipherOutputStreamOzone) {
- OutputStream wrappedStream =
- ((CipherOutputStreamOzone) outputStream).getWrappedStream();
- if (wrappedStream instanceof KeyOutputStream) {
- return ((KeyOutputStream)wrappedStream);
- }
- }
- // Otherwise return null.
- return null;
+ OutputStream base = unwrap(outputStream);
+ return base instanceof KeyOutputStream ? (KeyOutputStream) base : null;
}
@Override
public Map<String, String> getMetadata() {
- if (outputStream instanceof CryptoOutputStream) {
- return ((KeyMetadataAware)((CryptoOutputStream) outputStream)
- .getWrappedStream()).getMetadata();
- } else if (outputStream instanceof CipherOutputStreamOzone) {
- return ((KeyMetadataAware)((CipherOutputStreamOzone) outputStream)
- .getWrappedStream()).getMetadata();
+ OutputStream base = unwrap(outputStream);
+ if (base instanceof KeyMetadataAware) {
+ return ((KeyMetadataAware) base).getMetadata();
+ }
+ throw new IllegalStateException(
+ "OutputStream is not KeyMetadataAware: " + base.getClass());
+ }
+
+ private OutputStream unwrap(OutputStream out) {
Review Comment:
nit: either make `static`, or remove the parameter `out` and work with field
`outputStream`.
##########
hadoop-ozone/client/src/test/java/org/apache/hadoop/ozone/client/io/FakeKeyOutputStream.java:
##########
@@ -0,0 +1,35 @@
+/*
+ * 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 org.apache.hadoop.ozone.client.io;
+
+import java.util.Map;
+
+class FakeKeyOutputStream extends KeyOutputStream implements KeyMetadataAware {
Review Comment:
This top-level class can be removed, as it duplicates
`TestOzoneOutputStream.FakeKeyOutputStream`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
