From 0b26ce7e25fb3ef6011a286ec9d1263333c28900 Mon Sep 17 00:00:00 2001 From: Matteo Merli Date: Thu, 14 Jun 2018 19:22:10 -0700 Subject: [PATCH] Fixed License header for ByteBufCoded{Input,Output}Stream.java (#1971) --- dev/README.md | 21 +++++++++++++++ pom.xml | 3 +++ .../protobuf/ByteBufCodedInputStream.java | 27 ++++--------------- .../protobuf/ByteBufCodedOutputStream.java | 27 ++++--------------- 4 files changed, 34 insertions(+), 44 deletions(-) diff --git a/dev/README.md b/dev/README.md index 6be1070d0f5b1..856ae6aefa562 100644 --- a/dev/README.md +++ b/dev/README.md @@ -1,3 +1,24 @@ + + ## Apache Pulsar Dev Tools ### Running Integration Tests on macOS diff --git a/pom.xml b/pom.xml index 39e2b92995678..7b3d23efefdcb 100644 --- a/pom.xml +++ b/pom.xml @@ -923,6 +923,8 @@ flexible messaging model and an intuitive client API. src/main/java/org/apache/bookkeeper/mledger/proto/MLDataFormats.java src/main/java/org/apache/pulsar/broker/service/schema/proto/SchemaRegistryFormat.java src/main/java/org/apache/pulsar/common/api/proto/PulsarApi.java + **/ByteBufCodedInputStream.java + **/ByteBufCodedOutputStream.java bin/proto/* **/*.patch data/** @@ -1013,6 +1015,7 @@ flexible messaging model and an intuitive client API. licenses/LICENSE-*.txt + pulsar-client-cpp/pkg/licenses/LICENSE-*.txt src/assemble/README.bin.txt src/assemble/LICENSE.bin.txt src/assemble/NOTICE.bin.txt diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/protobuf/ByteBufCodedInputStream.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/protobuf/ByteBufCodedInputStream.java index 1843d188b80d8..937b083d84198 100644 --- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/protobuf/ByteBufCodedInputStream.java +++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/protobuf/ByteBufCodedInputStream.java @@ -1,25 +1,3 @@ -/** - * 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. - */ -/** - * This file is derived from Google ProcolBuffer CodedInputStream class - */ - // Protocol Buffers - Google's data interchange format // Copyright 2008 Google Inc. All rights reserved. // http://code.google.com/p/protobuf/ @@ -50,6 +28,11 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* + * This file is derived from Google ProcolBuffer CodedInputStream class + * with adaptations to work directly with Netty ByteBuf instances. + */ + package org.apache.pulsar.common.util.protobuf; import io.netty.buffer.ByteBuf; diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/util/protobuf/ByteBufCodedOutputStream.java b/pulsar-common/src/main/java/org/apache/pulsar/common/util/protobuf/ByteBufCodedOutputStream.java index 8cb8dccf04e9c..2a58e4af8c3ba 100644 --- a/pulsar-common/src/main/java/org/apache/pulsar/common/util/protobuf/ByteBufCodedOutputStream.java +++ b/pulsar-common/src/main/java/org/apache/pulsar/common/util/protobuf/ByteBufCodedOutputStream.java @@ -1,25 +1,3 @@ -/** - * 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. - */ -/** - * This file is derived from Google ProcolBuffer CodedOutputStream class - */ - // Protocol Buffers - Google's data interchange format // Copyright 2008 Google Inc. All rights reserved. // http://code.google.com/p/protobuf/ @@ -50,6 +28,11 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* + * This file is derived from Google ProcolBuffer CodedOutputStream class + * with adaptations to work directly with Netty ByteBuf instances. + */ + package org.apache.pulsar.common.util.protobuf; import io.netty.buffer.ByteBuf;