Merge pull request #665 from AbhayChandel/develop

Merging changes for Third party dependencies upgrade

boms/bom/pom.xml

@@ -19,7 +19,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <cxf.version>3.1.9</cxf.version>
+    <cxf.version>3.2.5</cxf.version>
     <mmm.util.version>7.5.1</mmm.util.version>
     <oasp.flatten.mode>bom</oasp.flatten.mode>
   </properties>
@@ -108,12 +108,6 @@
         <artifactId>cglib</artifactId>
         <version>3.2.5</version>
       </dependency>
-      <!-- Support for dynamic and type-safe JPA queries -->
-      <dependency>
-        <groupId>com.querydsl</groupId>
-        <artifactId>querydsl-jpa</artifactId>
-        <version>4.1.4</version>
-      </dependency>
       <!-- DataBase Connection Pooling -->
       <dependency>
         <groupId>org.apache.commons</groupId>
@@ -143,7 +137,7 @@
       <dependency>
         <groupId>javax.ws.rs</groupId>
         <artifactId>javax.ws.rs-api</artifactId>
-        <version>2.0.1</version>
+          <version>2.1</version>
       </dependency>
       <!-- CXF for REST and Webservices -->
       <dependency>
@@ -181,6 +175,12 @@
         <artifactId>cxf-rt-rs-client</artifactId>
         <version>${cxf.version}</version>
       </dependency>
+      <!-- Json Dependency -->
+      <dependency>
+        <groupId>org.json</groupId>
+        <artifactId>json</artifactId>
+        <version>20180130</version>
+      </dependency>
       <!-- Jackson for JSON mapping -->
       <dependency>
         <groupId>com.fasterxml.jackson.jaxrs</groupId>
@@ -240,7 +240,7 @@
       <dependency>
         <groupId>javax.el</groupId>
         <artifactId>javax.el-api</artifactId>
-        <version>2.2.4</version>
+        <version>3.0.0</version>
       </dependency>
       <dependency>
         <groupId>org.glassfish.web</groupId>

modules/batch/src/main/java/io/oasp/module/batch/common/base/SpringBootBatchCommandLine.java

@@ -167,13 +167,13 @@ public void execute(Operation operation, List<String> configurations, String job
       throws Exception {
 
     // get sources of configuration
-    Object[] configurationObjects = new Object[configurations.size()];
+    Class<?>[] configurationClasses = new Class[configurations.size()];
     for (int i = 0; i < configurations.size(); i++) {
 
-      configurationObjects[i] = getConfiguration(configurations.get(i));
+      configurationClasses[i] = Class.forName(configurations.get(i));
     }
 
-    SpringApplication app = new SpringApplication(configurationObjects);
+    SpringApplication app = new SpringApplication(configurationClasses);
 
     // no (web) server needed
     app.setWebEnvironment(false);
@@ -182,14 +182,14 @@ public void execute(Operation operation, List<String> configurations, String job
     ConfigurableApplicationContext ctx = app.run(new String[0]);
 
     switch (operation) {
-    case START:
-      startBatch(ctx, jobName, parameters);
-      break;
-    case STOP:
-      stopBatch(ctx, jobName);
-      break;
-    default:
-      throw new RuntimeException("Unknown operation: " + operation);
+      case START:
+        startBatch(ctx, jobName, parameters);
+        break;
+      case STOP:
+        stopBatch(ctx, jobName);
+        break;
+      default:
+        throw new RuntimeException("Unknown operation: " + operation);
     }
 
   }

modules/jpa-basic/src/main/java/io/oasp/module/jpa/dataaccess/api/QueryHelper.java

@@ -368,7 +368,7 @@ protected <E> Page<E> findPaginatedGeneric(Pageable pageable, JPAQuery<E> query,
     if (determineTotal) {
       total = query.clone().fetchCount();
     }
-    int offset = 0;
+    long offset = 0;
     if (pageable != null) {
       offset = pageable.getOffset();
       query.offset(offset);

modules/jpa-dao/src/main/java/io/oasp/module/jpa/dataaccess/base/AbstractGenericDao.java

@@ -228,4 +228,4 @@ public void delete(Iterable<? extends E> entities) {
     }
   }
 
-}
+}

modules/jpa-spring-data/src/main/java/io/oasp/module/jpa/dataaccess/api/data/GenericRepository.java

@@ -5,7 +5,6 @@
 import java.io.Serializable;
 import java.util.Collection;
 
-import net.sf.mmm.util.exception.api.ObjectNotFoundException;
 import net.sf.mmm.util.exception.api.ObjectNotFoundUserException;
 
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -42,16 +41,11 @@ public interface GenericRepository<E, ID extends Serializable>
   /**
    * @param id the {@link net.sf.mmm.util.entity.api.PersistenceEntity#getId() primary key}. May not be {@code null}.
    * @return the requested entity. Never {@code null}.
-   * @throws ObjectNotFoundException if the requested entity does not exist.
-   * @see #findOne(java.io.Serializable)
+   * @see #findById(java.io.Serializable)
    */
-  default E find(ID id) throws ObjectNotFoundException {
+  default E find(ID id) {
 
-    E entity = findOne(id);
-    if (entity == null) {
-      throw new ObjectNotFoundUserException(getEntityClass(), id);
-    }
-    return entity;
+    return findById(id).orElseThrow(() -> new ObjectNotFoundUserException(getEntityClass(), id));
   }
 
   /**

modules/logging/pom.xml

@@ -51,6 +51,10 @@
       <artifactId>oasp4j-test</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter</artifactId>
+    </dependency>
   </dependencies>
 
 </project>

modules/logging/src/main/java/io/oasp/module/logging/common/impl/DiagnosticContextFilter.java

@@ -15,6 +15,8 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.context.WebApplicationContext;
 
 import io.oasp.module.logging.common.api.DiagnosticContextFacade;
 
@@ -39,6 +41,9 @@ public class DiagnosticContextFilter implements Filter {
   /** @see #setCorrelationIdHttpHeaderName(String) */
   private String correlationIdHttpHeaderName;
 
+  @Autowired
+  private WebApplicationContext webApplicationContext;
+
   private DiagnosticContextFacade diagnosticContextFacade;
 
   /**
@@ -141,8 +146,8 @@ public void init(FilterConfig config) throws ServletException {
         // ClassNotFoundException and use the fallback in the catch statement.
         ServletContext servletContext = config.getServletContext();
         org.springframework.web.context.WebApplicationContext springContext;
-        springContext =
-            org.springframework.web.context.support.WebApplicationContextUtils.getWebApplicationContext(servletContext);
+        springContext = org.springframework.web.context.support.WebApplicationContextUtils
+            .getWebApplicationContext(servletContext);
         this.diagnosticContextFacade = springContext.getBean(DiagnosticContextFacade.class);
       } catch (Throwable e) {
         LOG.warn("DiagnosticContextFacade not defined in spring. Falling back to default", e);

modules/logging/src/test/java/io/oasp/module/logging/common/impl/DiagnosticContextFilterTest.java

@@ -35,8 +35,8 @@ public void testCorrelationIdHttpHeaderNameAfterConstructor() {
     DiagnosticContextFilter filter = new DiagnosticContextFilter();
 
     // exercise
-    String correlationIdHttpHeaderName =
-        (String) ReflectionTestUtils.getField(filter, CORRELATION_ID_HEADER_NAME_PARAM);
+    String correlationIdHttpHeaderName = (String) ReflectionTestUtils.getField(filter,
+        CORRELATION_ID_HEADER_NAME_PARAM);
 
     // verify
     assertThat(correlationIdHttpHeaderName).isNotNull();
@@ -56,8 +56,8 @@ public void testInitWithNullInitParameter() throws Exception {
     filter.init(this.config);
 
     // verify
-    String correlationIdHttpHeaderName =
-        (String) ReflectionTestUtils.getField(filter, CORRELATION_ID_HEADER_NAME_PARAM);
+    String correlationIdHttpHeaderName = (String) ReflectionTestUtils.getField(filter,
+        CORRELATION_ID_HEADER_NAME_PARAM);
     assertThat(correlationIdHttpHeaderName).isNotNull()
         .isEqualTo(DiagnosticContextFilter.CORRELATION_ID_HEADER_NAME_DEFAULT);
   }
@@ -76,8 +76,8 @@ public void testInitWithNonDefaultParameter() throws Exception {
     // exercise
     filter.init(this.config);
     // verify
-    String correlationIdHttpHeaderName =
-        (String) ReflectionTestUtils.getField(filter, CORRELATION_ID_HEADER_NAME_PARAM);
+    String correlationIdHttpHeaderName = (String) ReflectionTestUtils.getField(filter,
+        CORRELATION_ID_HEADER_NAME_PARAM);
     assertThat(correlationIdHttpHeaderName).isEqualTo(nonDefaultParameter);
   }
 }

modules/rest/pom.xml

@@ -65,7 +65,7 @@
       <scope>test</scope>
     </dependency>
      <dependency>
-      <groupId>org.hibernate</groupId>
+      <groupId>org.hibernate.validator</groupId>
       <artifactId>hibernate-validator</artifactId>
       <scope>test</scope>
     </dependency>

modules/service/src/main/java/io/oasp/module/service/common/impl/discovery/ServiceDiscovererImplConfig.java

@@ -3,7 +3,7 @@
 import javax.inject.Inject;
 
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.context.embedded.EmbeddedServletContainerInitializedEvent;
+import org.springframework.boot.web.context.WebServerInitializedEvent;
 import org.springframework.context.ApplicationListener;
 
 import io.oasp.module.basic.common.api.config.ConfigProperties;
@@ -24,8 +24,7 @@
  *
  * @since 3.0.0
  */
-public class ServiceDiscovererImplConfig
-    implements ServiceDiscoverer, ApplicationListener<EmbeddedServletContainerInitializedEvent> {
+public class ServiceDiscovererImplConfig implements ServiceDiscoverer, ApplicationListener<WebServerInitializedEvent> {
 
   // @Value("${local.server.port}")
   private int localServerPort;
@@ -45,9 +44,9 @@ public void setConfig(ServiceConfig config) {
   }
 
   @Override
-  public void onApplicationEvent(EmbeddedServletContainerInitializedEvent event) {
+  public void onApplicationEvent(WebServerInitializedEvent event) {
 
-    this.localServerPort = event.getEmbeddedServletContainer().getPort();
+    this.localServerPort = event.getWebServer().getPort();
   }
 
   @Override
@@ -107,8 +106,8 @@ private String resolveVariables(String url2, String application) {
 
     String resolvedUrl = url2;
     resolvedUrl = resolvedUrl.replace(ServiceConstants.VARIABLE_APP, application);
-    resolvedUrl =
-        resolvedUrl.replace(ServiceConstants.VARIABLE_LOCAL_SERVER_PORT, Integer.toString(this.localServerPort));
+    resolvedUrl = resolvedUrl.replace(ServiceConstants.VARIABLE_LOCAL_SERVER_PORT,
+        Integer.toString(this.localServerPort));
     return resolvedUrl;
   }
 

modules/test/pom.xml

@@ -22,7 +22,6 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-test</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>

pom.xml

@@ -19,12 +19,12 @@
   </modules>
 
   <properties>
-    <java.version>1.7</java.version>
+    <java.version>1.8</java.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <oasp4j.version>3.0.0-SNAPSHOT</oasp4j.version>
+    <oasp4j.version>3.0.0-alpha.1</oasp4j.version>
     <oasp.flatten.mode>oss</oasp.flatten.mode>
-    <spring.boot.version>1.5.3.RELEASE</spring.boot.version>
+    <spring.boot.version>2.0.4.RELEASE</spring.boot.version>
     <javadoc.option.doclint></javadoc.option.doclint>
     <maven.archetype.version>3.0.1</maven.archetype.version>
   </properties>
@@ -338,7 +338,7 @@
         <plugin>
           <groupId>org.springframework.boot</groupId>
           <artifactId>spring-boot-maven-plugin</artifactId>
-          <version>1.5.7.RELEASE</version>
+          <version>2.0.4.RELEASE</version>
         </plugin>
       </plugins>
     </pluginManagement>

templates/server/src/main/resources/archetype-resources/__batch__/src/main/java/__packageInPathFormat__/SpringBootBatchApp.java

@@ -1,11 +1,11 @@
 package ${package};
 
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.actuate.autoconfigure.EndpointAutoConfiguration;
+import org.springframework.boot.actuate.autoconfigure.endpoint.EndpointAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.boot.autoconfigure.security.SecurityAutoConfiguration;
-import org.springframework.boot.autoconfigure.security.SecurityFilterAutoConfiguration;
+import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
+import org.springframework.boot.autoconfigure.security.servlet.SecurityFilterAutoConfiguration;
 import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
 
 import io.oasp.module.jpa.dataaccess.api.AdvancedRevisionEntity;

templates/server/src/main/resources/archetype-resources/core/pom.xml

@@ -99,7 +99,7 @@
 
     <!-- For Bean-Validation (JSR 303) -->
     <dependency>
-      <groupId>org.hibernate</groupId>
+      <groupId>org.hibernate.validator</groupId>
       <artifactId>hibernate-validator</artifactId>
     </dependency>
 
@@ -265,4 +265,4 @@
     </plugins>
   </build>
 
-</project>
+</project>

templates/server/src/main/resources/archetype-resources/core/src/main/java/__packageInPathFormat__/general/logic/impl/UcManageBinaryObjectImpl.java

@@ -48,20 +48,20 @@ public BinaryObjectEto saveBinaryObject(Blob data, BinaryObjectEto binaryObjectE
   @Override
   public void deleteBinaryObject(Long binaryObjectId) {
 
-    this.binaryObjectRepository.delete(binaryObjectId);
+    this.binaryObjectRepository.deleteById(binaryObjectId);
 
   }
 
   @Override
   public BinaryObjectEto findBinaryObject(Long binaryObjectId) {
 
-    return getBeanMapper().map(this.binaryObjectRepository.findOne(binaryObjectId), BinaryObjectEto.class);
+    return getBeanMapper().map(this.binaryObjectRepository.find(binaryObjectId), BinaryObjectEto.class);
   }
 
   @Override
   public Blob getBinaryObjectBlob(Long binaryObjectId) {
 
-    return this.binaryObjectRepository.findOne(binaryObjectId).getData();
+    return this.binaryObjectRepository.find(binaryObjectId).getData();
   }
 
 }