-
Notifications
You must be signed in to change notification settings - Fork 8.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '2.x' into issue_6957_2.x_1
- Loading branch information
Showing
35 changed files
with
482 additions
and
167 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
69 changes: 69 additions & 0 deletions
69
common/src/main/java/org/apache/seata/common/store/LockMode.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| /* | ||
| * 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 org.apache.seata.common.store; | ||
|
|
||
| public enum LockMode { | ||
| /** | ||
| * The File store mode. | ||
| */ | ||
| FILE("file"), | ||
| /** | ||
| * The Db store mode. | ||
| */ | ||
| DB("db"), | ||
| /** | ||
| * The Redis store mode. | ||
| */ | ||
| REDIS("redis"), | ||
| /** | ||
| * raft store | ||
| */ | ||
| RAFT("raft"); | ||
|
|
||
| private String name; | ||
|
|
||
| LockMode(String name) { | ||
| this.name = name; | ||
| } | ||
|
|
||
| public static LockMode get(String name) { | ||
| for (LockMode mode : LockMode.values()) { | ||
| if (mode.getName().equalsIgnoreCase(name)) { | ||
| return mode; | ||
| } | ||
| } | ||
| throw new IllegalArgumentException("unknown lock mode:" + name); | ||
| } | ||
|
|
||
| /** | ||
| * whether contains value of store mode | ||
| * | ||
| * @param name the mode name | ||
| * @return the boolean | ||
| */ | ||
| public static boolean contains(String name) { | ||
| try { | ||
| return get(name) != null ? true : false; | ||
| } catch (IllegalArgumentException e) { | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| public String getName() { | ||
| return name; | ||
| } | ||
| } |
69 changes: 69 additions & 0 deletions
69
common/src/main/java/org/apache/seata/common/store/SessionMode.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| /* | ||
| * 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 org.apache.seata.common.store; | ||
|
|
||
| public enum SessionMode { | ||
| /** | ||
| * The File store mode. | ||
| */ | ||
| FILE("file"), | ||
| /** | ||
| * The Db store mode. | ||
| */ | ||
| DB("db"), | ||
| /** | ||
| * The Redis store mode. | ||
| */ | ||
| REDIS("redis"), | ||
| /** | ||
| * raft store | ||
| */ | ||
| RAFT("raft"); | ||
|
|
||
| private String name; | ||
|
|
||
| SessionMode(String name) { | ||
| this.name = name; | ||
| } | ||
|
|
||
| public static SessionMode get(String name) { | ||
| for (SessionMode mode : SessionMode.values()) { | ||
| if (mode.getName().equalsIgnoreCase(name)) { | ||
| return mode; | ||
| } | ||
| } | ||
| throw new IllegalArgumentException("unknown session mode:" + name); | ||
| } | ||
|
|
||
| /** | ||
| * whether contains value of store mode | ||
| * | ||
| * @param name the mode name | ||
| * @return the boolean | ||
| */ | ||
| public static boolean contains(String name) { | ||
| try { | ||
| return get(name) != null ? true : false; | ||
| } catch (IllegalArgumentException e) { | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| public String getName() { | ||
| return name; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
59 changes: 59 additions & 0 deletions
59
...in/java/org/apache/seata/spring/boot/autoconfigure/listener/SeataApplicationListener.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| /* | ||
| * 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 org.apache.seata.spring.boot.autoconfigure.listener; | ||
|
|
||
| import org.apache.seata.common.holder.ObjectHolder; | ||
| import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent; | ||
| import org.springframework.boot.context.event.ApplicationReadyEvent; | ||
| import org.springframework.boot.context.logging.LoggingApplicationListener; | ||
| import org.springframework.context.ApplicationEvent; | ||
| import org.springframework.context.event.GenericApplicationListener; | ||
| import org.springframework.core.ResolvableType; | ||
| import org.springframework.core.env.ConfigurableEnvironment; | ||
|
|
||
| import static org.apache.seata.common.Constants.OBJECT_KEY_SPRING_CONFIGURABLE_ENVIRONMENT; | ||
|
|
||
|
|
||
| public class SeataApplicationListener implements GenericApplicationListener { | ||
|
|
||
| @Override | ||
| public boolean supportsEventType(ResolvableType eventType) { | ||
| return eventType.getRawClass() != null | ||
| && (ApplicationEnvironmentPreparedEvent.class.isAssignableFrom(eventType.getRawClass()) || | ||
| ApplicationReadyEvent.class.isAssignableFrom(eventType.getRawClass())); | ||
| } | ||
|
|
||
| @Override | ||
| public void onApplicationEvent(ApplicationEvent event) { | ||
| if (!(event instanceof ApplicationEnvironmentPreparedEvent)) { | ||
| return; | ||
| } | ||
| ApplicationEnvironmentPreparedEvent environmentPreparedEvent = (ApplicationEnvironmentPreparedEvent)event; | ||
| ConfigurableEnvironment environment = environmentPreparedEvent.getEnvironment(); | ||
| ObjectHolder.INSTANCE.setObject(OBJECT_KEY_SPRING_CONFIGURABLE_ENVIRONMENT, environment); | ||
| } | ||
|
|
||
| /** | ||
| * higher than LoggingApplicationListener | ||
| * | ||
| * @return the order | ||
| */ | ||
| @Override | ||
| public int getOrder() { | ||
| return LoggingApplicationListener.DEFAULT_ORDER - 1; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.