From 47774381e679c948fb61cd0dbc6937cb01fa22ef Mon Sep 17 00:00:00 2001 From: "chen.ma" Date: Sun, 9 Oct 2022 23:31:01 +0800 Subject: [PATCH] Formatting of code --- .github/workflows/ci.yml | 2 +- .../cn/hippo4j/auth/config/FilterConfig.java | 17 +++++++++++++++++ .../auth/filter/RewriteUserInfoApiFilter.java | 17 +++++++++++++++++ .../java/cn/hippo4j/auth/toolkit/AuthUtil.java | 17 +++++++++++++++++ ...AbstractConfigModificationVerifyService.java | 2 +- .../service/AlarmControlHandlerTest.java | 17 +++++++++++++++++ pom.xml | 2 +- 7 files changed, 71 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3ace1daf..d4495376 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,4 +64,4 @@ jobs: steps: - uses: actions/checkout@v3 - name: Build with Maven - run: echo y | mvn clean install -Dskip.gpg=true -Dspotless.apply.skip=true + run: echo y | mvn clean install -Dskip.gpg=true -Dspotless.apply.skip=true -Dmaven.javadoc.skip=true diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/config/FilterConfig.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/config/FilterConfig.java index f8f65bd1..76aa3602 100644 --- a/hippo4j-auth/src/main/java/cn/hippo4j/auth/config/FilterConfig.java +++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/config/FilterConfig.java @@ -1,3 +1,20 @@ +/* + * 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. + */ + package cn.hippo4j.auth.config; import cn.hippo4j.auth.filter.RewriteUserInfoApiFilter; diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/filter/RewriteUserInfoApiFilter.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/filter/RewriteUserInfoApiFilter.java index da5d5a89..8e789d30 100644 --- a/hippo4j-auth/src/main/java/cn/hippo4j/auth/filter/RewriteUserInfoApiFilter.java +++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/filter/RewriteUserInfoApiFilter.java @@ -1,3 +1,20 @@ +/* + * 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. + */ + package cn.hippo4j.auth.filter; import cn.hippo4j.auth.toolkit.AuthUtil; diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/toolkit/AuthUtil.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/toolkit/AuthUtil.java index 881862cd..ab6f9b9a 100644 --- a/hippo4j-auth/src/main/java/cn/hippo4j/auth/toolkit/AuthUtil.java +++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/toolkit/AuthUtil.java @@ -1,3 +1,20 @@ +/* + * 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. + */ + package cn.hippo4j.auth.toolkit; import org.springframework.beans.factory.annotation.Value; diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/AbstractConfigModificationVerifyService.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/AbstractConfigModificationVerifyService.java index cc333f98..2a037c82 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/AbstractConfigModificationVerifyService.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/AbstractConfigModificationVerifyService.java @@ -82,7 +82,7 @@ public abstract class AbstractConfigModificationVerifyService implements ConfigM .eq(reqDTO.getTpId() != null, HisConfigVerifyInfo::getTpId, reqDTO.getTpId()) .and(reqDTO.getIdentify() != null, wrapper -> wrapper.eq(HisConfigVerifyInfo::getIdentify, reqDTO.getIdentify()).or().eq(HisConfigVerifyInfo::getModifyAll, true)) .lt(HisConfigVerifyInfo::getGmtCreate, gmtCreate) - .eq(HisConfigVerifyInfo::getVerifyStatus,VerifyEnum.TO_VERIFY.getVerifyStatus()) + .eq(HisConfigVerifyInfo::getVerifyStatus, VerifyEnum.TO_VERIFY.getVerifyStatus()) .set(HisConfigVerifyInfo::getVerifyStatus, VerifyEnum.VERIFY_INVALID.getVerifyStatus()); hisConfigVerifyMapper.update(null, invalidUpdateWrapper); } diff --git a/hippo4j-message/src/test/java/cn/hippo4j/message/service/AlarmControlHandlerTest.java b/hippo4j-message/src/test/java/cn/hippo4j/message/service/AlarmControlHandlerTest.java index 5a1a13bd..b9a7c879 100644 --- a/hippo4j-message/src/test/java/cn/hippo4j/message/service/AlarmControlHandlerTest.java +++ b/hippo4j-message/src/test/java/cn/hippo4j/message/service/AlarmControlHandlerTest.java @@ -1,3 +1,20 @@ +/* + * 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. + */ + package cn.hippo4j.message.service; import cn.hippo4j.message.dto.AlarmControlDTO; diff --git a/pom.xml b/pom.xml index 71f3e5fc..5a0d41b5 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ - 1.4.2-alpha.2 + 1.4.2-SNAPSHOT 6.5.0 2.9.3