Merge pull request #1 from matzew/aerogear_package

Changing packages, and copyright to all AeroGear/RedHat
aerogear · Aug 24, 2017 · 5d68cb5 · 5d68cb5
2 parents 0336269 + 8234bee
commit 5d68cb5
Show file tree

Hide file tree

Showing 34 changed files with 136 additions and 149 deletions.
diff --git a/pom.xml b/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (C) 2017 Matthias Wessendorf
+  Copyright 2017 Red Hat, Inc, and individual contributors.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -18,22 +18,22 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.sonatype.oss</groupId>
-    <artifactId>oss-parent</artifactId>
-    <version>9</version>
+    <groupId>org.jboss</groupId>
+    <artifactId>jboss-parent</artifactId>
+    <version>21</version>
   </parent>
 
-  <groupId>net.wessendorf.kafka</groupId>
+  <groupId>org.aerogear.kafka</groupId>
   <artifactId>kafka-cdi-extension</artifactId>
   <version>0.0.10-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>kafka-cdi</name>
   <description>simple CDI extension for Apache Kafka</description>
 
   <scm>
-    <connection>scm:git:git://github.com/matzew/kafka-cdi.git</connection>
-    <developerConnection>scm:git:git@github.com:matzew/kafka-cdi.git</developerConnection>
-    <url>https://github.com/matzew/kafka-cdi</url>
+    <connection>scm:git:git://github.com/aerogear/kafka-cdi.git</connection>
+    <developerConnection>scm:git:git@github.com:aerogear/kafka-cdi.git</developerConnection>
+    <url>https://github.com/aerogear/kafka-cdi</url>
     <tag>HEAD</tag>
   </scm>
 

diff --git a/...fka/DefaultConsumerRebalanceListener.java → ...fka/DefaultConsumerRebalanceListener.java b/...fka/DefaultConsumerRebalanceListener.java → ...fka/DefaultConsumerRebalanceListener.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2017 Matthias Wessendorf.
+ * Copyright 2017 Red Hat, Inc, and individual contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.wessendorf.kafka;
+package org.aerogear.kafka;
 
 import org.apache.kafka.clients.consumer.Consumer;
 import org.apache.kafka.clients.consumer.ConsumerRebalanceListener;

diff --git a/...wessendorf/kafka/SimpleKafkaProducer.java → ...g/aerogear/kafka/SimpleKafkaProducer.java b/...wessendorf/kafka/SimpleKafkaProducer.java → ...g/aerogear/kafka/SimpleKafkaProducer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2017 Matthias Wessendorf.
+ * Copyright 2017 Red Hat, Inc, and individual contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.wessendorf.kafka;
+package org.aerogear.kafka;
 
 import org.apache.kafka.clients.producer.Callback;
 import org.apache.kafka.clients.producer.RecordMetadata;

diff --git a/...endorf/kafka/cdi/annotation/Consumer.java → ...rogear/kafka/cdi/annotation/Consumer.java b/...endorf/kafka/cdi/annotation/Consumer.java → ...rogear/kafka/cdi/annotation/Consumer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2017 Matthias Wessendorf.
+ * Copyright 2017 Red Hat, Inc, and individual contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.wessendorf.kafka.cdi.annotation;
+package org.aerogear.kafka.cdi.annotation;
 
-import net.wessendorf.kafka.DefaultConsumerRebalanceListener;
+import org.aerogear.kafka.DefaultConsumerRebalanceListener;
 import org.apache.kafka.clients.consumer.ConsumerRebalanceListener;
 
 import java.lang.annotation.Documented;
@@ -24,7 +24,6 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.util.List;
 
 /**
  * Simple annotation for POJO beans, to advertise their one argument methods as a consumer for a given Kafka topic.

diff --git a/...orf/kafka/cdi/annotation/KafkaConfig.java → ...ear/kafka/cdi/annotation/KafkaConfig.java b/...orf/kafka/cdi/annotation/KafkaConfig.java → ...ear/kafka/cdi/annotation/KafkaConfig.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2017 Matthias Wessendorf.
+ * Copyright 2017 Red Hat, Inc, and individual contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.wessendorf.kafka.cdi.annotation;
+package org.aerogear.kafka.cdi.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

diff --git a/...orf/kafka/cdi/annotation/KafkaStream.java → ...ear/kafka/cdi/annotation/KafkaStream.java b/...orf/kafka/cdi/annotation/KafkaStream.java → ...ear/kafka/cdi/annotation/KafkaStream.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2017 Matthias Wessendorf.
+ * Copyright 2017 Red Hat, Inc, and individual contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.wessendorf.kafka.cdi.annotation;
+package org.aerogear.kafka.cdi.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

diff --git a/...endorf/kafka/cdi/annotation/Producer.java → ...rogear/kafka/cdi/annotation/Producer.java b/...endorf/kafka/cdi/annotation/Producer.java → ...rogear/kafka/cdi/annotation/Producer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2017 Matthias Wessendorf.
+ * Copyright 2017 Red Hat, Inc, and individual contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.wessendorf.kafka.cdi.annotation;
+package org.aerogear.kafka.cdi.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

diff --git a/...f/kafka/cdi/extension/KafkaExtension.java → ...r/kafka/cdi/extension/KafkaExtension.java b/...f/kafka/cdi/extension/KafkaExtension.java → ...r/kafka/cdi/extension/KafkaExtension.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2017 Matthias Wessendorf.
+ * Copyright 2017 Red Hat, Inc, and individual contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.wessendorf.kafka.cdi.extension;
-
-import net.wessendorf.kafka.SimpleKafkaProducer;
-import net.wessendorf.kafka.cdi.annotation.KafkaConfig;
-import net.wessendorf.kafka.cdi.annotation.Consumer;
-import net.wessendorf.kafka.cdi.annotation.KafkaStream;
-import net.wessendorf.kafka.cdi.annotation.Producer;
-import net.wessendorf.kafka.impl.DelegationKafkaConsumer;
-import net.wessendorf.kafka.impl.DelegationStreamProcessor;
-import net.wessendorf.kafka.impl.InjectedKafkaProducer;
-import net.wessendorf.kafka.serialization.CafdiSerdes;
+package org.aerogear.kafka.cdi.extension;
+
+import org.aerogear.kafka.cdi.annotation.Consumer;
+import org.aerogear.kafka.cdi.annotation.KafkaConfig;
+import org.aerogear.kafka.impl.DelegationKafkaConsumer;
+import org.aerogear.kafka.impl.DelegationStreamProcessor;
+import org.aerogear.kafka.impl.InjectedKafkaProducer;
+import org.aerogear.kafka.serialization.CafdiSerdes;
+import org.aerogear.kafka.SimpleKafkaProducer;
+import org.aerogear.kafka.cdi.annotation.KafkaStream;
+import org.aerogear.kafka.cdi.annotation.Producer;
 import org.apache.kafka.common.serialization.Serde;
 import org.apache.kafka.common.serialization.Serializer;
 import org.slf4j.Logger;
@@ -56,7 +56,6 @@
 import java.util.concurrent.TimeUnit;
 
 import static java.util.Collections.newSetFromMap;
-import static net.wessendorf.kafka.cdi.extension.VerySimpleEnvironmentResolver.simpleBootstrapServerResolver;
 import static org.apache.kafka.clients.CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG;
 import static org.apache.kafka.clients.producer.ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG;
 import static org.apache.kafka.clients.producer.ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG;
@@ -80,7 +79,7 @@ public void kafkaConfig(@Observes @WithAnnotations(KafkaConfig.class) ProcessAnn
         // we just do the first
         if (kafkaConfig != null && bootstrapServers == null) {
             logger.info("setting bootstrap.servers IP for, {}", kafkaConfig.bootstrapServers());
-            bootstrapServers = simpleBootstrapServerResolver(kafkaConfig.bootstrapServers());
+            bootstrapServers = VerySimpleEnvironmentResolver.simpleBootstrapServerResolver(kafkaConfig.bootstrapServers());
         }
     }
 

diff --git a/...ension/VerySimpleEnvironmentResolver.java → ...ension/VerySimpleEnvironmentResolver.java b/...ension/VerySimpleEnvironmentResolver.java → ...ension/VerySimpleEnvironmentResolver.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2017 Matthias Wessendorf.
+ * Copyright 2017 Red Hat, Inc, and individual contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.wessendorf.kafka.cdi.extension;
+package org.aerogear.kafka.cdi.extension;
 
 import java.util.Arrays;
 import java.util.List;

diff --git a/...f/kafka/impl/DelegationKafkaConsumer.java → ...r/kafka/impl/DelegationKafkaConsumer.java b/...f/kafka/impl/DelegationKafkaConsumer.java → ...r/kafka/impl/DelegationKafkaConsumer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2017 Matthias Wessendorf.
+ * Copyright 2017 Red Hat, Inc, and individual contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.wessendorf.kafka.impl;
+package org.aerogear.kafka.impl;
 
-import net.wessendorf.kafka.DefaultConsumerRebalanceListener;
-import net.wessendorf.kafka.cdi.annotation.Consumer;
-import net.wessendorf.kafka.serialization.CafdiSerdes;
+import org.aerogear.kafka.DefaultConsumerRebalanceListener;
+import org.aerogear.kafka.cdi.annotation.Consumer;
+import org.aerogear.kafka.serialization.CafdiSerdes;
 import org.apache.kafka.clients.consumer.ConsumerRebalanceListener;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.kafka.clients.consumer.ConsumerRecords;

diff --git a/...kafka/impl/DelegationStreamProcessor.java → ...kafka/impl/DelegationStreamProcessor.java b/...kafka/impl/DelegationStreamProcessor.java → ...kafka/impl/DelegationStreamProcessor.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2017 Matthias Wessendorf.
+ * Copyright 2017 Red Hat, Inc, and individual contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,14 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.wessendorf.kafka.impl;
+package org.aerogear.kafka.impl;
 
-import net.wessendorf.kafka.cdi.annotation.KafkaStream;
-import org.apache.kafka.clients.consumer.Consumer;
+import org.aerogear.kafka.cdi.annotation.KafkaStream;
 import org.apache.kafka.clients.consumer.ConsumerConfig;
-import org.apache.kafka.clients.producer.Producer;
 import org.apache.kafka.common.serialization.Serdes;
-import org.apache.kafka.streams.KafkaClientSupplier;
 import org.apache.kafka.streams.KafkaStreams;
 import org.apache.kafka.streams.StreamsConfig;
 import org.apache.kafka.streams.kstream.KStream;
@@ -34,11 +31,9 @@
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.BeanManager;
 import java.lang.reflect.InvocationTargetException;
-import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 import java.util.UUID;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 public class DelegationStreamProcessor {
 

diff --git a/...orf/kafka/impl/InjectedKafkaProducer.java → ...ear/kafka/impl/InjectedKafkaProducer.java b/...orf/kafka/impl/InjectedKafkaProducer.java → ...ear/kafka/impl/InjectedKafkaProducer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2017 Matthias Wessendorf.
+ * Copyright 2017 Red Hat, Inc, and individual contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.wessendorf.kafka.impl;
+package org.aerogear.kafka.impl;
 
-import net.wessendorf.kafka.SimpleKafkaProducer;
+import org.aerogear.kafka.SimpleKafkaProducer;
 import org.apache.kafka.clients.producer.Callback;
 import org.apache.kafka.clients.producer.ProducerRecord;
 import org.apache.kafka.clients.producer.RecordMetadata;

diff --git a/...dorf/kafka/serialization/CafdiSerdes.java → ...gear/kafka/serialization/CafdiSerdes.java b/...dorf/kafka/serialization/CafdiSerdes.java → ...gear/kafka/serialization/CafdiSerdes.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2017 Matthias Wessendorf.
+ * Copyright 2017 Red Hat, Inc, and individual contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.wessendorf.kafka.serialization;
+package org.aerogear.kafka.serialization;
 
 import org.apache.kafka.common.serialization.Serde;
 import org.apache.kafka.common.serialization.Serdes;

diff --git a/...ka/serialization/GenericDeserializer.java → ...ka/serialization/GenericDeserializer.java b/...ka/serialization/GenericDeserializer.java → ...ka/serialization/GenericDeserializer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2017 Dimitra Zuccarelli.
+ * Copyright 2017 Red Hat, Inc, and individual contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.wessendorf.kafka.serialization;
+package org.aerogear.kafka.serialization;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.kafka.common.errors.SerializationException;

diff --git a/...afka/serialization/GenericSerializer.java → ...afka/serialization/GenericSerializer.java b/...afka/serialization/GenericSerializer.java → ...afka/serialization/GenericSerializer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2017 Dimitra Zuccarelli.
+ * Copyright 2017 Red Hat, Inc, and individual contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.wessendorf.kafka.serialization;
+package org.aerogear.kafka.serialization;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;

diff --git a/...serialization/JsonObjectDeserializer.java → ...serialization/JsonObjectDeserializer.java b/...serialization/JsonObjectDeserializer.java → ...serialization/JsonObjectDeserializer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2017 Matthias Wessendorf.
+ * Copyright 2017 Red Hat, Inc, and individual contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.wessendorf.kafka.serialization;
+package org.aerogear.kafka.serialization;
 
 import org.apache.kafka.common.errors.SerializationException;
 import org.apache.kafka.common.serialization.Deserializer;

diff --git a/...a/serialization/JsonObjectSerializer.java → ...a/serialization/JsonObjectSerializer.java b/...a/serialization/JsonObjectSerializer.java → ...a/serialization/JsonObjectSerializer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2017 Matthias Wessendorf.
+ * Copyright 2017 Red Hat, Inc, and individual contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.wessendorf.kafka.serialization;
+package org.aerogear.kafka.serialization;
 
 import org.apache.kafka.common.errors.SerializationException;
 import org.apache.kafka.common.serialization.Serializer;

diff --git a/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2017 Matthias Wessendorf
+#  Copyright 2017 Red Hat, Inc, and individual contributors.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -14,4 +14,4 @@
 #  limitations under the License.
 #
 
-net.wessendorf.kafka.cdi.extension.KafkaExtension
+org.aerogear.kafka.cdi.extension.KafkaExtension