Merge pull request #8432 from kwoyke/BAEL-20537

BAEL-20537: Standardize packages for some smaller modules

apache-fop/src/main/webapp/WEB-INF/web.xml

@@ -16,7 +16,7 @@
     </context-param>
     <context-param>
         <param-name>contextConfigLocation</param-name>
-        <param-value>org.baeldung.config</param-value>
+        <param-value>com.baeldung.config</param-value>
     </context-param>
 
     <listener>

apache-fop/src/test/java/com/baeldung/java/ApacheFOPConvertHTMLIntegrationTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.java;
+package com.baeldung.java;
 
 import java.io.BufferedOutputStream;
 import java.io.File;

apache-fop/src/test/java/com/baeldung/java/ApacheFOPHeroldLiveTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.java;
+package com.baeldung.java;
 
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;

apache-olingo/olingo2/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.baeldung.examples.olingo2</groupId>
+    <groupId>com.baeldung.examples.olingo2</groupId>
     <artifactId>olingo2</artifactId>
     <name>olingo2</name>
     <description>Sample Olingo 2 Project</description>

apache-olingo/olingo2/src/main/java/com/baeldung/examples/olingo2/CarsODataJPAServiceFactory.java

@@ -1,4 +1,4 @@
-package org.baeldung.examples.olingo2;
+package com.baeldung.examples.olingo2;
 
 import java.util.List;
 import java.util.Map;
@@ -9,10 +9,8 @@ import javax.persistence.EntityManagerFactory;
 import javax.persistence.EntityTransaction;
 import javax.persistence.FlushModeType;
 import javax.persistence.LockModeType;
-import javax.persistence.Persistence;
 import javax.persistence.Query;
 import javax.persistence.StoredProcedureQuery;
-import javax.persistence.SynchronizationType;
 import javax.persistence.TypedQuery;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaDelete;
@@ -25,11 +23,8 @@ import org.apache.olingo.odata2.api.processor.ODataContext;
 import org.apache.olingo.odata2.jpa.processor.api.ODataJPAContext;
 import org.apache.olingo.odata2.jpa.processor.api.ODataJPAServiceFactory;
 import org.apache.olingo.odata2.jpa.processor.api.exception.ODataJPARuntimeException;
-import org.baeldung.examples.olingo2.JerseyConfig.EntityManagerFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.orm.jpa.EntityManagerFactoryUtils;
-import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
 import org.springframework.stereotype.Component;
 
 /**
@@ -58,7 +53,7 @@ public class CarsODataJPAServiceFactory extends ODataJPAServiceFactory {
         ODataJPAContext ctx = getODataJPAContext();
         ODataContext octx = ctx.getODataContext();
         HttpServletRequest request = (HttpServletRequest)octx.getParameter(ODataContext.HTTP_SERVLET_REQUEST_OBJECT);
-        EntityManager em = (EntityManager)request.getAttribute(EntityManagerFilter.EM_REQUEST_ATTRIBUTE);
+        EntityManager em = (EntityManager)request.getAttribute(JerseyConfig.EntityManagerFilter.EM_REQUEST_ATTRIBUTE);
                 
         // Here we're passing the EM that was created by the EntityManagerFilter (see JerseyConfig)
         ctx.setEntityManager(new EntityManagerWrapper(em));

apache-olingo/olingo2/src/main/java/com/baeldung/examples/olingo2/JerseyConfig.java

@@ -1,11 +1,10 @@
-    package org.baeldung.examples.olingo2;
+    package com.baeldung.examples.olingo2;
 
 import java.io.IOException;
 
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.EntityTransaction;
-import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.ApplicationPath;
 import javax.ws.rs.Path;

apache-olingo/olingo2/src/main/java/com/baeldung/examples/olingo2/Olingo2SampleApplication.java

@@ -1,8 +1,7 @@
-package org.baeldung.examples.olingo2;
+package com.baeldung.examples.olingo2;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 
 @SpringBootApplication

apache-olingo/olingo2/src/main/java/com/baeldung/examples/olingo2/domain/CarMaker.java

@@ -1,4 +1,4 @@
-package org.baeldung.examples.olingo2.domain;
+package com.baeldung.examples.olingo2.domain;
 
 import java.util.List;
 

apache-olingo/olingo2/src/main/java/com/baeldung/examples/olingo2/domain/CarModel.java

@@ -1,4 +1,4 @@
-package org.baeldung.examples.olingo2.domain;
+package com.baeldung.examples.olingo2.domain;
 
 import javax.persistence.Entity;
 import javax.persistence.FetchType;

apache-olingo/olingo2/src/test/java/com/baeldung/examples/olingo2/Olingo2SampleApplicationUnitTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.examples.olingo2;
+package com.baeldung.examples.olingo2;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

custom-pmd/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.baeldung.pmd</groupId>
+    <groupId>com.baeldung.pmd</groupId>
     <artifactId>custom-pmd</artifactId>
     <version>0.0.1</version>
     <name>custom-pmd</name>

custom-pmd/src/main/java/com/baeldung/pmd/UnitTestNamingConventionRule.java

@@ -1,4 +1,4 @@
-package org.baeldung.pmd;
+package com.baeldung.pmd;
 
 import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceDeclaration;
 import net.sourceforge.pmd.lang.java.rule.AbstractJavaRule;

grpc/src/main/java/com/baeldung/grpc/client/GrpcClient.java

@@ -1,8 +1,8 @@
-package org.baeldung.grpc.client;
+package com.baeldung.grpc.client;
 
-import org.baeldung.grpc.HelloRequest;
-import org.baeldung.grpc.HelloResponse;
-import org.baeldung.grpc.HelloServiceGrpc;
+import com.baeldung.grpc.HelloRequest;
+import com.baeldung.grpc.HelloResponse;
+import com.baeldung.grpc.HelloServiceGrpc;
 
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;

grpc/src/main/java/com/baeldung/grpc/server/GrpcServer.java

@@ -1,4 +1,4 @@
-package org.baeldung.grpc.server;
+package com.baeldung.grpc.server;
 
 import java.io.IOException;
 

grpc/src/main/java/com/baeldung/grpc/server/HelloServiceImpl.java

@@ -1,8 +1,8 @@
-package org.baeldung.grpc.server;
+package com.baeldung.grpc.server;
 
-import org.baeldung.grpc.HelloRequest;
-import org.baeldung.grpc.HelloResponse;
-import org.baeldung.grpc.HelloServiceGrpc.HelloServiceImplBase;
+import com.baeldung.grpc.HelloRequest;
+import com.baeldung.grpc.HelloResponse;
+import com.baeldung.grpc.HelloServiceGrpc.HelloServiceImplBase;
 
 import io.grpc.stub.StreamObserver;
 

grpc/src/main/proto/HelloService.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 option java_multiple_files = true;
-package org.baeldung.grpc;
+package com.baeldung.grpc;
 
 message HelloRequest {
     string firstName = 1;

guava-collections-set/src/test/java/com/baeldung/guava/GuavaMapFromSet.java

@@ -1,4 +1,4 @@
-package org.baeldung.guava;
+package com.baeldung.guava;
 
 import com.google.common.base.Function;
 

guava-collections-set/src/test/java/com/baeldung/guava/GuavaMapFromSetUnitTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.guava;
+package com.baeldung.guava;
 
 import com.google.common.base.Function;
 import org.junit.Test;

guava-collections-set/src/test/java/com/baeldung/guava/GuavaMultiSetUnitTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.guava;
+package com.baeldung.guava;
 
 import com.google.common.collect.HashMultiset;
 import com.google.common.collect.Multiset;

guava-collections-set/src/test/java/com/baeldung/guava/GuavaRangeSetUnitTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.guava;
+package com.baeldung.guava;
 
 import com.google.common.collect.ImmutableRangeSet;
 import com.google.common.collect.Range;

guava-collections-set/src/test/java/com/baeldung/guava/GuavaSetOperationsUnitTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.guava;
+package com.baeldung.guava;
 
 import com.google.common.base.Function;
 import com.google.common.base.Joiner;

guava-io/src/main/test/java/com/baeldung/guava/GuavaCountingOutputStreamUnitTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.guava;
+package com.baeldung.guava;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

guava-io/src/main/test/java/com/baeldung/guava/GuavaIOUnitTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.guava;
+package com.baeldung.guava;
 
 import static org.hamcrest.Matchers.contains;
 import static org.junit.Assert.assertEquals;

libraries-io/src/test/java/com/baeldung/java/io/remote/SftpFileTransferLiveTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.java.io.remote;
+package com.baeldung.java.io.remote;
 
 import java.io.IOException;
 

maven-all/maven/custom-rule/src/main/java/com/baeldung/enforcer/MyCustomRule.java

@@ -19,8 +19,8 @@ public class MyCustomRule implements EnforcerRule {
 
             String groupId = (String) enforcerRuleHelper.evaluate("${project.groupId}");
 
-            if (groupId == null || !groupId.startsWith("org.baeldung")) {
-                throw new EnforcerRuleException("Project group id does not start with org.baeldung");
+            if (groupId == null || !groupId.startsWith("com.baeldung")) {
+                throw new EnforcerRuleException("Project group id does not start with com.baeldung");
             }
 
         }

tensorflow-java/src/main/java/com/baeldung/tensorflow/TensorflowGraph.java

@@ -1,4 +1,4 @@
-package org.baeldung.tensorflow;
+package com.baeldung.tensorflow;
 
 import org.tensorflow.DataType;
 import org.tensorflow.Graph;

tensorflow-java/src/main/java/com/baeldung/tensorflow/TensorflowSavedModel.java

@@ -1,4 +1,4 @@
-package org.baeldung.tensorflow;
+package com.baeldung.tensorflow;
 
 import org.tensorflow.SavedModelBundle;
 import org.tensorflow.Tensor;

tensorflow-java/src/test/java/com/baeldung/tensorflow/TensorflowGraphUnitTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.tensorflow;
+package com.baeldung.tensorflow;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;