You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2018/12/15 18:23:39 UTC
[maven-javadoc-plugin] branch master updated: [MJAVADOC-434]
Running javadoc:fix corrupts files
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 30daf28 [MJAVADOC-434] Running javadoc:fix corrupts files
30daf28 is described below
commit 30daf280bd886083120869d29d98eca9a5689130
Author: rfscholte <rf...@apache.org>
AuthorDate: Sat Dec 15 19:23:31 2018 +0100
[MJAVADOC-434] Running javadoc:fix corrupts files
---
.../MJAVADOC-434_fixcompile/invoker.properties | 18 ++++
src/it/projects/MJAVADOC-434_fixcompile/pom.xml | 70 ++++++++++++++++
.../src/main/java/test/A.java | 26 ++++++
.../src/main/java/test/B.java | 98 ++++++++++++++++++++++
.../src/main/java/test/C.java | 88 +++++++++++++++++++
.../src/main/java/test/HttpRSSEState.java | 54 ++++++++++++
6 files changed, 354 insertions(+)
diff --git a/src/it/projects/MJAVADOC-434_fixcompile/invoker.properties b/src/it/projects/MJAVADOC-434_fixcompile/invoker.properties
new file mode 100644
index 0000000..52b0251
--- /dev/null
+++ b/src/it/projects/MJAVADOC-434_fixcompile/invoker.properties
@@ -0,0 +1,18 @@
+# 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.
+
+invoker.goals=javadoc:fix compile
diff --git a/src/it/projects/MJAVADOC-434_fixcompile/pom.xml b/src/it/projects/MJAVADOC-434_fixcompile/pom.xml
new file mode 100644
index 0000000..75f71ba
--- /dev/null
+++ b/src/it/projects/MJAVADOC-434_fixcompile/pom.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ 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.
+-->
+
+<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.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
+ <artifactId>mjavadoc434</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+
+ <url>https://issues.apache.org/jira/browse/MJAVADOC-434</url>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>@project.version@</version>
+ <configuration>
+ <detectLinks>true</detectLinks>
+ <force>true</force>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>3.2.2.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ <version>3.2.2.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.5</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ <version>2.5</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/src/it/projects/MJAVADOC-434_fixcompile/src/main/java/test/A.java b/src/it/projects/MJAVADOC-434_fixcompile/src/main/java/test/A.java
new file mode 100644
index 0000000..4500e05
--- /dev/null
+++ b/src/it/projects/MJAVADOC-434_fixcompile/src/main/java/test/A.java
@@ -0,0 +1,26 @@
+package test;
+
+/*
+ * 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.
+ */
+
+public abstract class A<T> {
+ protected abstract boolean a(String pathinfo);
+ public abstract boolean b(HttpRSSEState state);
+ protected abstract void c(HttpRSSEState state);
+}
diff --git a/src/it/projects/MJAVADOC-434_fixcompile/src/main/java/test/B.java b/src/it/projects/MJAVADOC-434_fixcompile/src/main/java/test/B.java
new file mode 100644
index 0000000..c3c20a8
--- /dev/null
+++ b/src/it/projects/MJAVADOC-434_fixcompile/src/main/java/test/B.java
@@ -0,0 +1,98 @@
+package test;
+
+/*
+ * 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.
+ */
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.List;
+
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@SuppressWarnings("")
+@Component
+/**
+ *
+ */
+public class B
+ extends A<HttpRSSEState> {
+
+ private static final Logger logger = LoggerFactory.getLogger(
+ B.class);
+
+ protected static final String a = "";
+ protected static final String b = "";
+ protected static final String c ="";
+
+ protected static final String d = "";
+
+ protected List<String> e = Collections.emptyList();
+ private ArrayList<String> f = new ArrayList<String>();
+
+ public static final String g = "";
+ public static final String h = "";
+ public static final String i = "";
+
+ @Override
+ protected boolean a(String pathinfo) {
+ if (true) {
+ return true;
+ }
+
+ if (true) {
+ return false;
+ }
+ return pathinfo.endsWith("");
+ }
+
+ @Override
+ /**
+ */
+ public boolean b(HttpRSSEState state) {
+ //
+ return false;
+ }
+
+ @Override
+ protected void c(HttpRSSEState state) {
+ logger.debug("");
+
+ //
+ if (true) {
+ if (logger.isDebugEnabled())
+ logger.debug("");
+
+
+ } else if (true) {
+ if (logger.isDebugEnabled())
+ logger.debug("");
+
+ }
+ }
+}
diff --git a/src/it/projects/MJAVADOC-434_fixcompile/src/main/java/test/C.java b/src/it/projects/MJAVADOC-434_fixcompile/src/main/java/test/C.java
new file mode 100644
index 0000000..0d58a9f
--- /dev/null
+++ b/src/it/projects/MJAVADOC-434_fixcompile/src/main/java/test/C.java
@@ -0,0 +1,88 @@
+package test;
+
+/*
+ * 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.
+ */
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.servlet.AsyncHandlerInterceptor;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * @author aoeu
+ *
+ */
+public class C
+ implements AsyncHandlerInterceptor {
+
+ protected static final String a = "";
+ protected static final String b = "";
+ protected static final String d = "";
+ protected static final String e = "";
+
+ private static final Logger logger = LoggerFactory.getLogger(
+ C.class);
+
+ @Override
+ public boolean preHandle(HttpServletRequest request,
+ HttpServletResponse response, Object handler) throws Exception {
+ if (true) {
+ logger.trace("");
+ }
+ return true;
+ }
+
+ @Override
+ public void postHandle(HttpServletRequest request,
+ HttpServletResponse response, Object handler,
+ ModelAndView modelAndView) throws Exception {
+ //
+ if (true) {
+ logger.debug("");
+ }
+
+ if (true) {
+ if (true) {
+ logger.debug("");
+
+ }
+ }
+ }
+
+ @Override
+ /**
+ *
+ */
+ public void afterCompletion(HttpServletRequest request, HttpServletResponse response,
+ Object handler, Exception ex) throws Exception {
+ //
+ }
+
+ @Override
+ /**
+ *
+ */
+ public void afterConcurrentHandlingStarted(HttpServletRequest request,
+ HttpServletResponse response, Object handler) throws Exception {
+ //
+ }
+}
\ No newline at end of file
diff --git a/src/it/projects/MJAVADOC-434_fixcompile/src/main/java/test/HttpRSSEState.java b/src/it/projects/MJAVADOC-434_fixcompile/src/main/java/test/HttpRSSEState.java
new file mode 100644
index 0000000..8b47ebc
--- /dev/null
+++ b/src/it/projects/MJAVADOC-434_fixcompile/src/main/java/test/HttpRSSEState.java
@@ -0,0 +1,54 @@
+package test;
+
+/*
+ * 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.
+ */
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+
+/**
+ * @author asdf
+ *
+ */
+public class HttpRSSEState {
+ HttpServletRequest request = null;
+ HttpServletResponse response = null;
+ HttpSession httpSession = null;
+
+ public HttpServletRequest getRequest() {
+ return request;
+ }
+ public void setRequest(HttpServletRequest request) {
+ this.request = request;
+ }
+ public HttpServletResponse getResponse() {
+ return response;
+ }
+ public void setResponse(HttpServletResponse response) {
+ this.response = response;
+ }
+ public HttpSession getHttpSession() {
+ return httpSession;
+ }
+ public void setHttpSession(HttpSession httpSession) {
+ this.httpSession = httpSession;
+ }
+}